diff --git a/Manifest.files.gz b/Manifest.files.gz
index 7c2409a992bd..0a7b9ae73079 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 3b4b6fee7049..13f00bdff1ee 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/milter-regex/Manifest b/acct-group/milter-regex/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/net-analyzer/openvas-manager/metadata.xml b/acct-group/milter-regex/metadata.xml
similarity index 68%
rename from net-analyzer/openvas-manager/metadata.xml
rename to acct-group/milter-regex/metadata.xml
index fa26aa942e17..7f768180ded7 100644
--- a/net-analyzer/openvas-manager/metadata.xml
+++ b/acct-group/milter-regex/metadata.xml
@@ -2,14 +2,11 @@
- hasan.calisir@psauxit.com
- Hasan ÇALIŞIR
+ gentoo@seichter.de
+ Ralph Seichter
proxy-maint@gentoo.org
Proxy Maintainers
-
diff --git a/acct-group/milter-regex/milter-regex-0.ebuild b/acct-group/milter-regex/milter-regex-0.ebuild
new file mode 100644
index 000000000000..66c0befb8e78
--- /dev/null
+++ b/acct-group/milter-regex/milter-regex-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/milter-regex"
+ACCT_GROUP_ID=438
diff --git a/acct-group/shellinaboxd/Manifest b/acct-group/shellinaboxd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/shellinaboxd/metadata.xml b/acct-group/shellinaboxd/metadata.xml
new file mode 100644
index 000000000000..b09023bbc390
--- /dev/null
+++ b/acct-group/shellinaboxd/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ monsieurp@gentoo.org
+ Patrice Clement
+
+
+ shell-tools@gentoo.org
+ Gentoo Shell Tools Project
+
+
diff --git a/acct-group/shellinaboxd/shellinaboxd-0.ebuild b/acct-group/shellinaboxd/shellinaboxd-0.ebuild
new file mode 100644
index 000000000000..d76e14fea909
--- /dev/null
+++ b/acct-group/shellinaboxd/shellinaboxd-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="shellinabox group"
+ACCT_GROUP_ID=139
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 0586e8f6a33d..766e01ba4d64 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/milter-regex/Manifest b/acct-user/milter-regex/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/net-analyzer/openvas-libraries/metadata.xml b/acct-user/milter-regex/metadata.xml
similarity index 55%
rename from net-analyzer/openvas-libraries/metadata.xml
rename to acct-user/milter-regex/metadata.xml
index c71bb473eca2..7f768180ded7 100644
--- a/net-analyzer/openvas-libraries/metadata.xml
+++ b/acct-user/milter-regex/metadata.xml
@@ -2,16 +2,11 @@
- hasan.calisir@psauxit.com
- Hasan ÇALIŞIR
+ gentoo@seichter.de
+ Ralph Seichter
proxy-maint@gentoo.org
Proxy Maintainers
-
diff --git a/acct-user/milter-regex/milter-regex-0.ebuild b/acct-user/milter-regex/milter-regex-0.ebuild
new file mode 100644
index 000000000000..e28daf5f03d4
--- /dev/null
+++ b/acct-user/milter-regex/milter-regex-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mail-filter/milter-regex"
+
+ACCT_USER_ID=438
+ACCT_USER_GROUPS=( milter-regex )
+
+acct-user_add_deps
diff --git a/acct-user/shellinaboxd/Manifest b/acct-user/shellinaboxd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/shellinaboxd/metadata.xml b/acct-user/shellinaboxd/metadata.xml
new file mode 100644
index 000000000000..b09023bbc390
--- /dev/null
+++ b/acct-user/shellinaboxd/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ monsieurp@gentoo.org
+ Patrice Clement
+
+
+ shell-tools@gentoo.org
+ Gentoo Shell Tools Project
+
+
diff --git a/acct-user/shellinaboxd/shellinaboxd-0.ebuild b/acct-user/shellinaboxd/shellinaboxd-0.ebuild
new file mode 100644
index 000000000000..e7a3eaf808cc
--- /dev/null
+++ b/acct-user/shellinaboxd/shellinaboxd-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="shellinabox user"
+ACCT_USER_ID=139
+ACCT_USER_GROUPS=( shellinaboxd )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7155e4e0f26b..d83b3ca0500e 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index dd8145cb3d7a..5e135e3869c3 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,3 +1,3 @@
DIST sudo-1.8.28p1.tar.gz 3310254 BLAKE2B a1810af7a42d05cce49bb9d0acf6f3731a5193e9e9c3b458691379131eb86d36995854d11c09525e8d999ed1da7e99cf170634667c5a444aa522b8f23db7d1aa SHA512 bda3de34c15fbb68fc29759542295560ccc1562b419d03709cea51613937e9b92ba689c79c3ef4858aeea90d3d1a4dc0148225b11b22cf82395ae1bad8cb1734
DIST sudo-1.8.29.tar.gz 3338260 BLAKE2B 7ba29d155bfb1d7ba20e32ade2e8ee3919e70400b6c235e313052b247b48406b9a051e71daa7e47fdb0a9fd0889f4c05b8a1a170c027503b90081e8cec81660e SHA512 ea780922b2afb47df4df4b533fb355fd916cb18a6bfd13c7ca36a25b03ef585d805648c6fa85692bea363b1f83664ac3bc622f99bcd149b3a86f70522eb4d340
-DIST sudo-1.8.30b1.tar.gz 3341783 BLAKE2B fb950277ed66bd83516505cd2eb49b43412d5e95d4afcacf9cde34d685d5d80530deb248c3d421e1fc55343871d80eefdd492489f9bca6c952f81145f4a29746 SHA512 26525d2376fd80796fac146970ca5bbabe170900aca81f7ad71f80828920d27f323fbbf0191b1ba6ef027a53a156c5849aaee21e495b16f2b5188dfedf9746ba
+DIST sudo-1.8.30b2.tar.gz 3348480 BLAKE2B f158553fde9b5878cec39f95a69e6d3ef51ea8e5f5074c6b369d01d26c2de973bfefe5b40c64fc0c998f4e0045e054fcf8e01cfdc668003451489566c51f6ac2 SHA512 3d9e17ae4a51c65504d47a8a4a353f13fb2c761ffb90e0e9aca83e32effdd8bd826c96d80bdf9bb5520db37f02762937f020e64a330a530a1032c000d7cfa1f7
diff --git a/app-admin/sudo/sudo-1.8.30_beta1.ebuild b/app-admin/sudo/sudo-1.8.30_beta2.ebuild
similarity index 100%
rename from app-admin/sudo/sudo-1.8.30_beta1.ebuild
rename to app-admin/sudo/sudo-1.8.30_beta2.ebuild
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 88e79608f892..f90365cdcd2d 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 5629dd3ca1c2..0152f1ab2f7a 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1 @@
-DIST stress-ng-0.10.13.tar.xz 409940 BLAKE2B fffeaedd999a0887955674f3883f65124eb13814cf284ab1bd7c7dec34380cd381026d9217c9f949a7c0c2227c8b9558409153d0feff01473a6c9f49730f89b4 SHA512 97e8a7ce5dc5e428c26b0d4eeb1350c43c1043aa7dbf591112768c33e208bafe9df7fe737c9a912f0b4296d64e4b27b81131b459c356aca95bc8856e8b939639
+DIST stress-ng-0.10.14.tar.xz 410204 BLAKE2B 347a8e5eed70b23022de7bf6af53547e25e704647f6d37f328a60e3023b40a44f627f146199d847641ef5493e167cdcce11d1b945b851bbc4c84cf67b449d1f8 SHA512 f2c2f46c72f7d5a10f2522be775821d6f199253eac4e9a1f0ecdb3c7007a0ab4eb0c671b35abbff34601fcf71f4c8ea60c8bdca9a5a7986c9e9c0e2e009f462a
diff --git a/app-benchmarks/stress-ng/stress-ng-0.10.13.ebuild b/app-benchmarks/stress-ng/stress-ng-0.10.14.ebuild
similarity index 92%
rename from app-benchmarks/stress-ng/stress-ng-0.10.13.ebuild
rename to app-benchmarks/stress-ng/stress-ng-0.10.14.ebuild
index 342e1b2caa46..4aef97058dd1 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.10.13.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.10.14.ebuild
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}"
DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.10.13-makefile.patch" )
src_compile() {
tc-export CC
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 8c62b162cc51..34acb08efd00 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index e59b628d2009..fba37e4616cb 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
- >=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild
deleted file mode 100644
index 50c48fc0ff29..000000000000
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd user
-
-DESCRIPTION="TPM2 Access Broker & Resource Manager"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/dbus:=
- dev-libs/glib:=
- app-crypt/tpm2-tss:="
-DEPEND="${RDEPEND}
- test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
- dev-util/gdbus-codegen"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
- enewgroup tss
- enewuser tss -1 -1 / tss
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_enable test unit) \
- --disable-defaultflags \
- --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
- --with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
- --with-systemdpresetdisable \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
deleted file mode 100644
index 7743ba624f99..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info udev user
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/0" # sublot is libtss2-sys number
-KEYWORDS="~amd64"
-IUSE="doc +gcrypt openssl static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- gcrypt? ( !openssl )
- openssl? ( !gcrypt )
- || ( gcrypt openssl )"
-
-RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
- openssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
- test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-pkg_setup() {
- local CONFIG_CHECK=" \
- ~TCG_TPM
- "
- linux-info_pkg_setup
- kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-
- enewgroup tss
- enewuser tss -1 -1 /var/lib/tpm tss
-}
-
-src_configure() {
- econf \
- $(use_enable doc doxygen-doc) \
- $(use_enable static-libs static) \
- $(use_enable test unit) \
- --disable-defaultflags \
- --with-crypto="$(usex gcrypt gcrypt ossl)" \
- --with-udevrulesdir="$(get_udevdir)/rules.d" \
- --with-udevrulesprefix=60-
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index a566bd01b2f9..ef30f47b59b3 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index a2427a90c7ff..58bb8928426b 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,2 +1,3 @@
DIST ebuild-mode-1.47.tar.xz 34812 BLAKE2B abbc3be110239f9e1765d4f1293856a7fc616d497ac5256a28b7d78fc57c8d725abccbf7b9e5908cb85f9a684dc1be26ab88152d836c2ec3a481802091729717 SHA512 13ee756ef914a314f6705df78735a3926a50d156f4abeff917bed68298aec81f072d53a60f7b985d9bb2caddcdbf65fd26f6c9189e6c5c1822674d9142b7db17
DIST ebuild-mode-1.48.tar.xz 34764 BLAKE2B cd54e8a1b65232538924aafd10f6dcadd457634313ccf08c97b841d0255f02496a0e3308a4d9cdcd5cbbc41f9f5c373e14641fa31202cfa369fd10f8562cf5da SHA512 d37d7951030877454416dca761c9775eadaa514f29bba8745f61c0f3a5ecb42675c230301286d5a8cce76d8ef7082f5db76151f69b35f6a999118c5e60a5f9c0
+DIST ebuild-mode-1.49.tar.xz 34632 BLAKE2B 3e7814363aedbb5a05193faccc0815a7f4b0f56eacb03fb720fa270ac69faa163bd8164639390b1703bb0a82341975e9bfea143c651b5b0ba2825b2bbb3b3329 SHA512 440e23aa6f63307955a9c970f5cbcc175eb14cca4ff4035da4f10fa22d9c6766b29ca7842b800a43c46063f3045c2ff3b2d6b8e27026f47bd0ed0959a8f2d0e9
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild
new file mode 100644
index 000000000000..d3f4d4b8fc71
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+BDEPEND="sys-apps/texinfo"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo-1.39.el"
+DOC_CONTENTS="Some optional features may require installation of additional
+ packages, like dev-python/docutils-glep for glep."
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 6503476a27bf..ee25b3f46a91 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/magicrescue/Manifest b/app-forensics/magicrescue/Manifest
index 0aa741015a5d..8c38341739eb 100644
--- a/app-forensics/magicrescue/Manifest
+++ b/app-forensics/magicrescue/Manifest
@@ -1,2 +1 @@
DIST magicrescue-1.1.10.tar.gz 227237 BLAKE2B a1584f4e6f4b6771783c565901775e181ba2e952e780565831e5d46245a4dd4670657cec7fb57b18d7dfc09954faec410da2dfe1b35130c23d22d8a6ccf0ab07 SHA512 54fc943a1f521563a3416040eb6b140e3ef79966b615ae0223be0558b810f9202c2d1e5ba0165c43a614caf78dbce1b0992775bef39e9611d2dc290e4582c29d
-DIST magicrescue-1.1.9.tar.gz 92621 BLAKE2B a0a3644729c8af3fab9294b211cfbba0a823186219a585923203236aee27954d2337f81fc4d9559b6dde43581c5ce2d6bae5c2961248e2c4f5dd1ab8e31d5b60 SHA512 3c0b97357f0d354dcf53045bbdf2ce81c451ae20c451d2d72dc8b2dbcc480cf48ab436494c0cca20c99f32c938c525074a561cbc779a580a648c674c150a7cc2
diff --git a/app-forensics/magicrescue/magicrescue-1.1.10.ebuild b/app-forensics/magicrescue/magicrescue-1.1.10.ebuild
index 732ae17c8280..d9f26ef7e6b8 100644
--- a/app-forensics/magicrescue/magicrescue-1.1.10.ebuild
+++ b/app-forensics/magicrescue/magicrescue-1.1.10.ebuild
@@ -11,11 +11,13 @@ SRC_URI="https://github.com/jbj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
DEPEND="|| ( sys-libs/gdbm sys-libs/db:* )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !net-mail/safecat"
+# File collision with net-mail/safecat, #702004
PATCHES=( "${FILESDIR}/${P}-ldflags.patch"
"${FILESDIR}/${P}-remove_toolsdir.patch" )
diff --git a/app-forensics/magicrescue/magicrescue-1.1.9.ebuild b/app-forensics/magicrescue/magicrescue-1.1.9.ebuild
deleted file mode 100644
index 20850ae7df70..000000000000
--- a/app-forensics/magicrescue/magicrescue-1.1.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Find deleted files in block devices"
-HOMEPAGE="http://www.itu.dk/people/jobr/magicrescue/"
-SRC_URI="http://www.itu.dk/people/jobr/magicrescue/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="|| ( sys-libs/gdbm sys-libs/db )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
- epatch "${FILESDIR}"/${P}-ldflags.patch
- tc-export CC
-}
-
-src_configure() {
- # Not autotools, just looks like it sometimes
- ./configure --prefix=/usr || die
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index fb85fb8e4d0d..69dfbd1885af 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/cargo-license/cargo-license-0.3.0.ebuild b/app-misc/cargo-license/cargo-license-0.3.0.ebuild
index d140a5b79970..dce7c3b9fee1 100644
--- a/app-misc/cargo-license/cargo-license-0.3.0.ebuild
+++ b/app-misc/cargo-license/cargo-license-0.3.0.ebuild
@@ -62,7 +62,7 @@ DESCRIPTION="Cargo subcommand to see license of dependencies"
HOMEPAGE="https://github.com/onur/cargo-license"
SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="MIT" # Update to proper Gentoo format
+LICENSE="Apache-2.0 MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index eaabe6f36d58..71fcc2dab0e6 100644
Binary files a/app-xemacs/Manifest.gz and b/app-xemacs/Manifest.gz differ
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index a2427a90c7ff..58bb8928426b 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,2 +1,3 @@
DIST ebuild-mode-1.47.tar.xz 34812 BLAKE2B abbc3be110239f9e1765d4f1293856a7fc616d497ac5256a28b7d78fc57c8d725abccbf7b9e5908cb85f9a684dc1be26ab88152d836c2ec3a481802091729717 SHA512 13ee756ef914a314f6705df78735a3926a50d156f4abeff917bed68298aec81f072d53a60f7b985d9bb2caddcdbf65fd26f6c9189e6c5c1822674d9142b7db17
DIST ebuild-mode-1.48.tar.xz 34764 BLAKE2B cd54e8a1b65232538924aafd10f6dcadd457634313ccf08c97b841d0255f02496a0e3308a4d9cdcd5cbbc41f9f5c373e14641fa31202cfa369fd10f8562cf5da SHA512 d37d7951030877454416dca761c9775eadaa514f29bba8745f61c0f3a5ecb42675c230301286d5a8cce76d8ef7082f5db76151f69b35f6a999118c5e60a5f9c0
+DIST ebuild-mode-1.49.tar.xz 34632 BLAKE2B 3e7814363aedbb5a05193faccc0815a7f4b0f56eacb03fb720fa270ac69faa163bd8164639390b1703bb0a82341975e9bfea143c651b5b0ba2825b2bbb3b3329 SHA512 440e23aa6f63307955a9c970f5cbcc175eb14cca4ff4035da4f10fa22d9c6766b29ca7842b800a43c46063f3045c2ff3b2d6b8e27026f47bd0ed0959a8f2d0e9
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.49.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.49.ebuild
new file mode 100644
index 000000000000..d329637b970d
--- /dev/null
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.49.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+RDEPEND=">=app-editors/xemacs-21.4.20-r5
+ app-xemacs/sh-script"
+BDEPEND="${RDEPEND}"
+
+src_compile() {
+ local XEMACS="${EPREFIX}/usr/bin/xemacs"
+
+ "${XEMACS}" -batch -q --no-site-file \
+ -eval "(add-to-list 'load-path \".\")" \
+ -f batch-byte-compile \
+ ebuild-mode.el gentoo-newsitem-mode.el || die
+
+ "${XEMACS}" -batch -q --no-site-file \
+ -eval "(setq autoload-package-name \"${PN}\")" \
+ -eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
+ -l autoload -f batch-update-autoloads \
+ ebuild-mode.el gentoo-newsitem-mode.el || die
+}
+
+src_install() {
+ insinto /usr/share/xemacs/site-packages/lisp/${PN}
+ doins *.el *.elc
+}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 47f1239bf303..bc8f8d86641e 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch b/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch
deleted file mode 100644
index 25e29728ca3a..000000000000
--- a/dev-haskell/hscolour/files/hscolour-1.19-ghc-7.5.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- hscolour-1.19-orig/Language/Haskell/HsColour/Colourise.hs 2011-06-06 03:05:04.000000000 +1000
-+++ hscolour-1.19/Language/Haskell/HsColour/Colourise.hs 2012-06-24 10:29:57.990963394 +1000
-@@ -1,3 +1,7 @@
-+{-# LANGUAGE CPP #-}
-+#if (__GLASGOW_HASKELL__>=705)
-+{-# LANGUAGE ScopedTypeVariables #-}
-+#endif
- module Language.Haskell.HsColour.Colourise
- ( module Language.Haskell.HsColour.ColourHighlight
- , ColourPrefs(..)
-@@ -9,6 +13,9 @@
- import Language.Haskell.HsColour.ColourHighlight
- import Language.Haskell.HsColour.Classify (TokenType(..))
-
-+#if (__GLASGOW_HASKELL__>=705)
-+import Control.Exception (catch, SomeException)
-+#endif
- import System.IO (hPutStrLn,stderr)
- import System.Environment (getEnv)
- import Data.List
-@@ -51,6 +58,16 @@
- -- | Read colour preferences from .hscolour file in the current directory, or failing that,
- -- from \$HOME\/.hscolour, and failing that, returns a default set of prefs.
- readColourPrefs :: IO ColourPrefs
-+#if (__GLASGOW_HASKELL__>=705)
-+readColourPrefs = catch
-+ (do val <- readFile ".hscolour"
-+ parseColourPrefs ".hscolour" val)
-+ (\(_ :: SomeException) -> catch
-+ (do home <- getEnv "HOME"
-+ val <- readFile (home++"/.hscolour")
-+ parseColourPrefs (home++"/.hscolour") val)
-+ (\(_ :: SomeException) -> return defaultColourPrefs))
-+#else
- readColourPrefs = catch
- (do val <- readFile ".hscolour"
- parseColourPrefs ".hscolour" val)
-@@ -59,6 +76,7 @@
- val <- readFile (home++"/.hscolour")
- parseColourPrefs (home++"/.hscolour") val)
- (\_-> return defaultColourPrefs))
-+#endif
-
- -- | Convert token classification to colour highlights.
- colourise :: ColourPrefs -> TokenType -> [Highlight]
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 87fa3911f447..656c0e61d531 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/crystal/files/crystal-0.26.1-gentoo-tests-network-sandbox-3.patch b/dev-lang/crystal/files/crystal-0.26.1-gentoo-tests-network-sandbox-3.patch
deleted file mode 100644
index eb1b84ce618c..000000000000
--- a/dev-lang/crystal/files/crystal-0.26.1-gentoo-tests-network-sandbox-3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/spec/std/http/server/server_spec.cr b/spec/std/http/server/server_spec.cr
-index 9de0c3f..59882db 100644
---- a/spec/std/http/server/server_spec.cr
-+++ b/spec/std/http/server/server_spec.cr
-@@ -400,7 +400,9 @@ module HTTP
- end
-
- describe "#bind_tls" 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
-@@ -512,7 +514,9 @@ module HTTP
- end
- {% end %}
-
-- it "handles exception during SSL handshake (#6577)" do
-+ # gentoo's FEATURES=network-sandbox blocks external network:
-+ # connect: Connection timed out (Errno)
-+ pending "handles exception during SSL handshake (#6577)" do
- server = SilentErrorHTTPServer.new do |context|
- context.response.print "ok"
- context.response.close
diff --git a/dev-lang/crystal/files/crystal-0.27.0-tcp-server-test.patch b/dev-lang/crystal/files/crystal-0.27.0-tcp-server-test.patch
deleted file mode 100644
index 8f61c8aeef47..000000000000
--- a/dev-lang/crystal/files/crystal-0.27.0-tcp-server-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/spec/std/http/server/server_spec.cr
-+++ b/spec/std/http/server/server_spec.cr
-@@ -524,7 +524,8 @@ module HTTP
- end
-
- describe "#close" do
-- it "closes gracefully" do
-+ # fails under gentoo's sandbox
-+ pending "closes gracefully" do
- server = Server.new do |context|
- context.response.flush
- context.response.puts "foo"
diff --git a/dev-lang/crystal/files/crystal-0.27.1-verbose.patch b/dev-lang/crystal/files/crystal-0.27.1-verbose.patch
deleted file mode 100644
index 33c3c5d61c41..000000000000
--- a/dev-lang/crystal/files/crystal-0.27.1-verbose.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -29,3 +29,3 @@ SOURCES := $(shell find src -name '*.cr')
- SPEC_SOURCES := $(shell find spec -name '*.cr')
--override FLAGS += -D preview_overflow -D compiler_rt $(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 += -D preview_overflow -D compiler_rt $(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/erlang/Manifest b/dev-lang/erlang/Manifest
index 63085fd2800f..12e0bb6a094f 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -3,6 +3,7 @@ DIST erlang-22.1.1.tar.gz 54951145 BLAKE2B 917813f750eacd3dc7da25f1fa9e1f9c55e6c
DIST erlang-22.1.4.tar.gz 54957524 BLAKE2B 8960dd63eb7ae18544d8b6809760543b276ec230d5a9051d1888269770f6c44b379b6ba85ce9106f7d37b76c41b7683a545ba80569e33195e3e9211f6ced4ee3 SHA512 271a188d46a79cd1c43c3b8059b77c0802af624ff88c6916e0b84994040750d9792f0416937ed98e874256562f27d858916239d79f93b545c98b9703e5018f7b
DIST erlang-22.1.7.tar.gz 54969082 BLAKE2B 4168b93e146de3dd22ec0d6088d2a2b62dc1a3d96d3c2859f65ef721a32f24ef74fb6baf3467da7b2c5b13a3b8d62602d3e94ddd359f091f548f958d9b8a77ea SHA512 72660ea481ac647a091b713a4a9240d1d008336152a41fd5f9f191c6050d42a67ddc0ff8bc51addc2e1d6f9a244516883df5025f005ae575fa101d941ac0bd05
DIST erlang-22.1.8.tar.gz 54967877 BLAKE2B cb022e3c5f577605872e7689639fced6c1f6cb7600314f5939107605f0767ca080c65c2f9e0695a04bf53a9e0727553d854a9df57f09ce5f4a958ebd035756e7 SHA512 4260fab3f6cd9338ca167371cd982bcf9557729e93d58c3911e485529ed8ee97089e1de3466745d21206c94276f9865ac4fddcb2803afe915494b43feda46dda
+DIST erlang-22.2.1.tar.gz 55742915 BLAKE2B cfb49a07289f66ee8bcdc37452c88ec60c90b92febb7d41538166916989e80b612f13bae4ae2ba305aa12c790a74bcd9dc8412207413ba512537193811d177ad SHA512 4c0e5b963def01e02f8550414bee9e15a79681ac19547c4707d4cf3a67924e252dde7f8f94dfeca5eb3d34730acaffd193603711531bdf7c22d47d8880c5e5f4
DIST erlang-22.2.tar.gz 55736930 BLAKE2B bcd67ea4ef5c358d4f0bcbec977e2c60a3b0f1ccccb2d38c35ba1908ed9d96727c83ab6cb6dc69ce90ffc6772e34de68014cc66ec8c3bfcda852844a4f6b1548 SHA512 a192da8ee02588c44e5c04bf2933c95672f596ca10f485c2c41d0c97563c90b5ea24fa02da61e007595f25a80557e6513372db3059bb7e394647a4c11f4cd41e
DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
DIST erlang_doc_html_22.1.tar.gz 33824830 BLAKE2B 2d50802fff81eba8bcf5f630da49d68d7cb2098175012e12f13941e69949a109c9f601c3cfaa2700b669415cd0c6c15961d8e4dd94b9b228cee17b661fe5400a SHA512 cc24927a4ff98b04d8f93fbc46bb36ffb34570521e4f31154b778dc17cf1cff60869239c26c327d7a9360c06528f9b380a302b39fa47285e50dfd4656b508202
diff --git a/dev-lang/erlang/erlang-22.2.1-r1.ebuild b/dev-lang/erlang/erlang-22.2.1-r1.ebuild
new file mode 100644
index 000000000000..3ffd63edd06e
--- /dev/null
+++ b/dev-lang/erlang/erlang-22.2.1-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0"
+
+inherit elisp-common java-pkg-opt-2 systemd wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+ http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+ doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code. See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+ acct-group/epmd
+ acct-user/epmd
+ sys-libs/ncurses:0
+ sys-libs/zlib
+ emacs? ( >=app-editors/emacs-23.1:* )
+ java? ( >=virtual/jdk-1.8:* )
+ odbc? ( dev-db/unixODBC )
+ sctp? ( net-misc/lksctp-tools )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.7d:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ systemd? ( sys-apps/systemd )
+ tk? ( dev-lang/tk:0 )
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/18.2.1-wx3.0.patch"
+ "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch"
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+ default
+
+ ./otp_build autoconf || die
+}
+
+src_configure() {
+ use wxwidgets && setup-wxwidgets
+
+ local myconf=(
+ --disable-builtin-zlib
+ $(use_enable hipe)
+ $(use_enable kpoll kernel-poll)
+ $(use_with java javac)
+ $(use_enable sctp)
+ $(use_with ssl ssl "${EPREFIX}"/usr)
+ $(use_enable ssl dynamic-ssl-lib)
+ $(use_enable systemd)
+ $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+ )
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ emake
+
+ if use emacs ; then
+ pushd lib/tools/emacs &>/dev/null || die
+ elisp-compile *.el
+ popd &>/dev/null || die
+ fi
+}
+
+extract_version() {
+ local path="$1"
+ local var_name="$2"
+ sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+ local erl_libdir_rel="$(get_libdir)/erlang"
+ local erl_libdir="/usr/${erl_libdir_rel}"
+ local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+ local erl_erts_ver="$(extract_version erts VSN)"
+ local my_manpath="/usr/share/${PN}/man"
+
+ [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+ [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+ emake INSTALL_PREFIX="${D}" install
+
+ if use doc ; then
+ local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
+ docompress -x /usr/share/doc/${PF}
+ else
+ local DOCS=("README.md")
+ fi
+
+ einstalldocs
+
+ dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+ dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+ dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+ dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+ dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+ ## Clean up the no longer needed files
+ rm "${ED}/${erl_libdir}/Install" || die
+
+ insinto "${my_manpath}"
+ doins -r "${WORKDIR}"/man/*
+ # extend MANPATH, so the normal man command can find it
+ # see bug 189639
+ newenvd - "90erlang" <<-_EOF_
+ MANPATH="${my_manpath}"
+ _EOF_
+
+ if use emacs ; then
+ elisp-install erlang lib/tools/emacs/*.{el,elc}
+ sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+ "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+ elisp-site-file-install "${T}/${SITEFILE}"
+ fi
+
+ newinitd "${FILESDIR}"/epmd.init-r2 epmd
+ newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+ use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index 9c2e0b7c1bda..d5a2bb56fca6 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -5,6 +5,14 @@
slyfox@gentoo.org
Sergei Trofimovich
+
+ arkamar@atlas.cz
+ Petr Vaněk
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+