gentoo resync : 10.11.2019

10 files changed, 201 insertions, 353 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 9e16914995c8..3e545078046f 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
index 12fabc384514..345ac6cacefe 100644
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -1,5 +1,7 @@
 DIST protonmail-bridge-1.1.6-1.x86_64.rpm 52547264 BLAKE2B abfc9657e7f15596f12609b9541a7616a405a86d02539340aa406f78c5abf1b766283dd6d954a15ebbb439402290f4a937d6c9a3d5b61de57383142dc878a379 SHA512 65524367fe9bf2a9fee7bb0be1cefc01eadf60494b65be9cb03c7ce73949d92c3312589a6f2801ca3cac89db226250529eefea12b0af744ca1c95ee4fc175435
 DIST protonmail-bridge-1.2.2-1.x86_64.rpm 52777739 BLAKE2B 84c11176e57586f11e0fb511bcdbc98fbc85a563ba68dd44454a9b10e493a01b4414bf776929afa0990f3e1677fd47ab1b6c16e7799e964cff617f8cc5190bd7 SHA512 7dad4fd0ef99925a0e70fa2fbce89b16d900b4fdbe8da7c914451aa60ac47121da0de2a5b475b8e3e5bd024bbe7b67667c8c9733b6e7435c222f034ca9406c58
+DIST protonmail-bridge-1.2.3-1.x86_64.rpm 52847419 BLAKE2B 604a1990ced2f9e64e99aad7f729ac48750f2b620036c7e953cc9b16e25187f201d2a148bb03a03bcf48fc72db3faefedd8102a4c099dca2c9c71e766804a6cc SHA512 98a92d1365baac975e3007a4a8d920aa8b5d0166d9c69deb4c9dd4f96cb314a5a60fb7bd43c35c33c89419b63dba5e4dc1526cf8518a0f6db4e3315b4eb8a420
 EBUILD protonmail-bridge-bin-1.1.6.ebuild 8721 BLAKE2B adf78e924e818eda91a6c19ce4058e7a62efbbac902b799721ebb406b9524b0f6b7a29996d741156a254e0e7fbfe14a448ab12ae82c522d8805fbc3ba14fb952 SHA512 3a38bc03ac813656c2e0d7f4e3f30842d4baad81c71c24ecabc2dc946856f73d47facef9174f9b6977304262ae35a3ade84d09eb7192b0926c07995773d3a762
 EBUILD protonmail-bridge-bin-1.2.2.ebuild 8721 BLAKE2B adf78e924e818eda91a6c19ce4058e7a62efbbac902b799721ebb406b9524b0f6b7a29996d741156a254e0e7fbfe14a448ab12ae82c522d8805fbc3ba14fb952 SHA512 3a38bc03ac813656c2e0d7f4e3f30842d4baad81c71c24ecabc2dc946856f73d47facef9174f9b6977304262ae35a3ade84d09eb7192b0926c07995773d3a762
+EBUILD protonmail-bridge-bin-1.2.3.ebuild 8721 BLAKE2B adf78e924e818eda91a6c19ce4058e7a62efbbac902b799721ebb406b9524b0f6b7a29996d741156a254e0e7fbfe14a448ab12ae82c522d8805fbc3ba14fb952 SHA512 3a38bc03ac813656c2e0d7f4e3f30842d4baad81c71c24ecabc2dc946856f73d47facef9174f9b6977304262ae35a3ade84d09eb7192b0926c07995773d3a762
 MISC metadata.xml 477 BLAKE2B 8d29a65220a234802a25b8979e598393883a4e905ed6b114297801b93f82212165749f8317791459314afe1c59c6f5a7c2e871bc85637387bc3decae250cec21 SHA512 7d081e416b0bf6b91e6ba69a1de51c35839ff1512ab3c93be3f161ab5e6a4a554d58549460bb7fb73e1dbaf44f76b673067f0f33c4d775143f500416e096f0bc
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.3.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.3.ebuild
new file mode 100644
index 000000000000..f3a5ead03295
--- /dev/null
+++ b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.3.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://protonmail.com/bridge/"
+SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
+
+RESTRICT="bindist mirror"
+
+LICENSE="MIT protonmail-bridge-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/glib:2
+	media-sound/pulseaudio[glib]
+	sys-apps/dbus
+	virtual/opengl
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+"
+BDEPEND="dev-util/patchelf"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	# Some bogus files got into package.
+	rm -rf usr/lib/.build-id
+
+	# Bug #660366. To workaround preserving libs, set RUNPATH and rm unused libs
+	cd "${S}/usr/lib/protonmail/bridge" || die
+	patchelf --set-rpath '$ORIGIN/lib' protonmail-bridge || die "patchelf failed"
+	patchelf --set-rpath '$ORIGIN' lib/libicui18n.so.56 || die "patchelf failed"
+	patchelf --set-rpath '$ORIGIN' lib/libicuuc.so.56 || die "patchelf failed"
+
+	rm "lib/libQt53DCore.so.5" || die
+	rm "lib/libQt53DExtras.so.5" || die
+	rm "lib/libQt53DInput.so.5" || die
+	rm "lib/libQt53DLogic.so.5" || die
+	rm "lib/libQt53DQuick.so.5" || die
+	rm "lib/libQt53DQuickExtras.so.5" || die
+	rm "lib/libQt53DQuickInput.so.5" || die
+	rm "lib/libQt53DQuickRender.so.5" || die
+	rm "lib/libQt53DRender.so.5" || die
+	rm "lib/libQt5Concurrent.so.5" || die
+	rm "lib/libQt5Gamepad.so.5" || die
+	rm "lib/libQt5QuickParticles.so.5" || die
+	rm "plugins/audio/libqtaudio_alsa.so" || die
+	rm "plugins/audio/libqtmedia_pulse.so" || die
+	rm "plugins/bearer/libqconnmanbearer.so" || die
+	rm "plugins/bearer/libqgenericbearer.so" || die
+	rm "plugins/bearer/libqnmbearer.so" || die
+	rm "plugins/canbus/libqtpeakcanbus.so" || die
+	rm "plugins/canbus/libqtsocketcanbus.so" || die
+	rm "plugins/canbus/libqttinycanbus.so" || die
+	rm "plugins/designer/libqquickwidget.so" || die
+	rm "plugins/designer/libqwebengineview.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-emu-integration.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-x11-integration.so" || die
+	rm "plugins/gamepads/libevdevgamepad.so" || die
+	rm "plugins/generic/libqevdevkeyboardplugin.so" || die
+	rm "plugins/generic/libqevdevmouseplugin.so" || die
+	rm "plugins/generic/libqevdevtabletplugin.so" || die
+	rm "plugins/generic/libqevdevtouchplugin.so" || die
+	rm "plugins/generic/libqtuiotouchplugin.so" || die
+	rm "plugins/geometryloaders/libdefaultgeometryloader.so" || die
+	rm "plugins/geometryloaders/libgltfgeometryloader.so" || die
+	rm "plugins/geoservices/libqtgeoservices_esri.so" || die
+	rm "plugins/geoservices/libqtgeoservices_itemsoverlay.so" || die
+	rm "plugins/geoservices/libqtgeoservices_mapbox.so" || die
+	rm "plugins/geoservices/libqtgeoservices_mapboxgl.so" || die
+	rm "plugins/geoservices/libqtgeoservices_nokia.so" || die
+	rm "plugins/geoservices/libqtgeoservices_osm.so" || die
+	rm "plugins/iconengines/libqsvgicon.so" || die
+	rm "plugins/mediaservice/libgstaudiodecoder.so" || die
+	rm "plugins/mediaservice/libgstcamerabin.so" || die
+	rm "plugins/mediaservice/libgstmediacapture.so" || die
+	rm "plugins/mediaservice/libgstmediaplayer.so" || die
+	rm "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so" || die
+	rm "plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so" || die
+	rm "plugins/platforms/libqeglfs.so" || die
+	rm "plugins/platforms/libqlinuxfb.so" || die
+	rm "plugins/platforms/libqminimal.so" || die
+	rm "plugins/platforms/libqminimalegl.so" || die
+	rm "plugins/platforms/libqoffscreen.so" || die
+	rm "plugins/platforms/libqvnc.so" || die
+	rm "plugins/platformthemes/libqgtk3.so" || die
+	rm "plugins/playlistformats/libqtmultimedia_m3u.so" || die
+	rm "plugins/position/libqtposition_geoclue.so" || die
+	rm "plugins/position/libqtposition_positionpoll.so" || die
+	rm "plugins/printsupport/libcupsprintersupport.so" || die
+	rm "plugins/qmltooling/libqmldbg_inspector.so" || die
+	rm "plugins/qmltooling/libqmldbg_local.so" || die
+	rm "plugins/qmltooling/libqmldbg_messages.so" || die
+	rm "plugins/qmltooling/libqmldbg_native.so" || die
+	rm "plugins/qmltooling/libqmldbg_nativedebugger.so" || die
+	rm "plugins/qmltooling/libqmldbg_profiler.so" || die
+	rm "plugins/qmltooling/libqmldbg_quickprofiler.so" || die
+	rm "plugins/qmltooling/libqmldbg_server.so" || die
+	rm "plugins/qmltooling/libqmldbg_tcp.so" || die
+	rm "plugins/renderplugins/libscene2d.so" || die
+	rm "plugins/sceneparsers/libassimpsceneimport.so" || die
+	rm "plugins/sceneparsers/libgltfsceneexport.so" || die
+	rm "plugins/sceneparsers/libgltfsceneimport.so" || die
+	rm "plugins/sensorgestures/libqtsensorgestures_plugin.so" || die
+	rm "plugins/sensorgestures/libqtsensorgestures_shakeplugin.so" || die
+	rm "plugins/sensors/libqtsensors_generic.so" || die
+	rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so" || die
+	rm "plugins/sensors/libqtsensors_linuxsys.so" || die
+	rm "plugins/sqldrivers/libqsqlite.so" || die
+	rm "plugins/sqldrivers/libqsqlmysql.so" || die
+	rm "plugins/sqldrivers/libqsqlpsql.so" || die
+	rm "plugins/xcbglintegrations/libqxcb-egl-integration.so" || die
+	rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so" || die
+	rm "qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so" || die
+	rm "qml/Qt/labs/platform/libqtlabsplatformplugin.so" || die
+	rm "qml/Qt/labs/settings/libqmlsettingsplugin.so" || die
+	rm "qml/Qt/labs/sharedimage/libsharedimageplugin.so" || die
+	rm "qml/Qt3D/Animation/libquick3danimationplugin.so" || die
+	rm "qml/Qt3D/Core/libquick3dcoreplugin.so" || die
+	rm "qml/Qt3D/Extras/libquick3dextrasplugin.so" || die
+	rm "qml/Qt3D/Input/libquick3dinputplugin.so" || die
+	rm "qml/Qt3D/Logic/libquick3dlogicplugin.so" || die
+	rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die
+	rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die
+	rm "qml/QtCanvas3D/libqtcanvas3d.so" || die
+	rm "qml/QtGamepad/libdeclarative_gamepad.so" || die
+	rm "qml/QtLocation/libdeclarative_location.so" || die
+	rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die
+	rm "qml/QtNfc/libdeclarative_nfc.so" || die
+	rm "qml/QtPositioning/libdeclarative_positioning.so" || die
+	rm "qml/QtQml/Models.2/libmodelsplugin.so" || die
+	rm "qml/QtQml/StateMachine/libqtqmlstatemachine.so" || die
+	rm "qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so" || die
+	rm "qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so" || die
+	rm "qml/QtQuick/Controls/libqtquickcontrolsplugin.so" || die
+	rm "qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so" || die
+	rm "qml/QtQuick/Dialogs/libdialogplugin.so" || die
+	rm "qml/QtQuick/Extras/libqtquickextrasplugin.so" || die
+	rm "qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so" || die
+	rm "qml/QtQuick/Particles.2/libparticlesplugin.so" || die
+	rm "qml/QtQuick/PrivateWidgets/libwidgetsplugin.so" || die
+	rm "qml/QtQuick/Scene2D/libqtquickscene2dplugin.so" || die
+	rm "qml/QtQuick/Scene3D/libqtquickscene3dplugin.so" || die
+	rm "qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so" || die
+	rm "qml/QtScxml/libdeclarative_scxml.so" || die
+	rm "qml/QtSensors/libdeclarative_sensors.so" || die
+	rm "qml/QtTest/libqmltestplugin.so" || die
+	rm "qml/QtWebChannel/libdeclarative_webchannel.so" || die
+	rm "qml/QtWebEngine/libqtwebengineplugin.so" || die
+	rm "qml/QtWebSockets/libdeclarative_qmlwebsockets.so" || die
+	rm "qml/QtWebView/libdeclarative_webview.so" || die
+	rm "lib/libQt5MultimediaGstTools.so.5" || die
+	rm "lib/libQt5OpenGL.so.5" || die
+	rm "lib/libQt5QuickWidgets.so.5" || die
+	rm "lib/libQt5EglFsKmsSupport.so.5" || die
+	rm "plugins/position/libqtposition_serialnmea.so" || die
+	rm "plugins/webview/libqtwebview_webengine.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so" || die
+	rm "plugins/texttospeech/libqtexttospeech_speechd.so" || die
+	rm "plugins/canbus/libqtpassthrucanbus.so" || die
+	rm "qml/QtQuick/Shapes/libqmlshapesplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die
+	rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die
+	rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die
+
+	default
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR usr "${D}"/ || die "Failed to copy files"
+
+	dosym "protonmail-bridge" "/usr/bin/${PN}"
+
+	insinto /etc/revdep-rebuild
+	newins - "50-${PN}" <<-EOF
+		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
+	EOF
+}
diff --git a/mail-mta/qmail-ldap/Manifest b/mail-mta/qmail-ldap/Manifest
deleted file mode 100644
index b6a419ec64da..000000000000
--- a/mail-mta/qmail-ldap/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX 1.03-warnings.patch 2604 BLAKE2B 5d0cfcca9824e095af1c42e356150b2ea069513f6cdf0e8efd7fad09590f80503348e99e67970fd5cc80a3b1b07a9eea8a23b499c061635eead3d7b27d9e051d SHA512 6bf142eb11dd14133786b4c8ff44e70e2e3ef625c7a488e1506030a73c34bb8029ac25be6e2567436aac8b08efaaa174260694875ec22795d8bbb2ca806849ac
-AUX samples.ldif 821 BLAKE2B 7d4b903dc18170a808722e8a110c1406fedd3827401f9511060ae6a05cb59fff17fc9c4f816e074473719e3171be4933bcaf825f24dcd46a5d95e5fd6d4a8f29 SHA512 2b77a383a1a2fb482f583b8044575ac476a3d0e6ee0a807b05cd42ba25d701e8f1562675518d76df23fbb33b7b7b1c691866ea7d8f918d73cd65c4a4ce52f38c
-DIST genqmail-20080406.tar.bz2 10252 BLAKE2B 4e959ff9a79c7621f8681866e2e614ecbd6a2c64b45a79f9c553b202f2a495fbd5b1eeefdebb0502c48c0fbed5ba37073d9b500f28217a9a568bdf7eb376b8a3 SHA512 744d0968307bfedebf0ca7bc0d5bd0780884326acaf5fea0a66fb91f8b0caf5ba52eb443c9cb2a7d6389622ca5c87100c3204ec3408aed8ef5fb1e7f80ff0d35
-DIST qmail-1.03.tar.gz 220668 BLAKE2B 3f48be4a7f3ce49dc4ebe260abf1ba330c3b214ef837cc91b0778f245b7c6bcc87ac174ffc41bd9280500e8d2619f6f8817f994d3d6b4f3b8b2e7c543e576a72 SHA512 f2cc47c3ef4a3595d5953f216811a9b60f505cf8cbfd31ae31a888ee04916936210ef1c23d59e8d280a5f0e1c3794b90ee212b2b0f36361c5eff842598c8aee2
-DIST qmail-ldap-1.03-20060201-controls20060401d.patch 195962 BLAKE2B b0e954d0f9b66183f108d773d9c9df52c3e8966a4944ae63c33fd5c680f62a089781ad15a213f4d412ba1a7b6976b5e41bccaab49270e96d1b692bc71010854d SHA512 7e75089de1f9ed09f2e1397cbe8b8e68ad44cc164af92eefdbbb58d7b11678505afc3f225d8038f68c891c3ec3443ae768c334593c0f347e4b16189a9606b181
-DIST qmail-ldap-1.03-20060201.patch.gz 270788 BLAKE2B 3e7e396c8f34b823f293ebb35dd722b6583406816ad9c99f5a883705e72fe69aa953d9513633c2b5074755d58690eb3ef0ac0318a677ce40731cafa003d98aa0 SHA512 c74dd4b600129cac808c8caef63ee8c969887b5c576cd700bb2d021d4480e3e854d147e3e3b72923abe9c3b8bc108c8f00ed7b842eba1f66a961b39f108df798
-DIST qmail-ldap-1.03-queue-custom-error.patch 2472 BLAKE2B 5d7cccdefc4f486ff8f84f951763a5ae0badc9d71c751d216999c6c7f3de791cf7f4670b279c1898c9d25455ed8de4c1e1e00bb7d81a314ace50c2726f807a49 SHA512 04db0c940e8c2a888298febc59a11ae023c154b0c21183134e5255b994630993d0a9241724f8bc5e64337c5444e2c3059d5cc29561ac70637cb40c3e52c5a3b3
-DIST qmail-ldap-1.03-spp-0.42.patch 13618 BLAKE2B 506a34d5f0b936bd41062d179eeb13d35cd82d40595f0d94e1c0bee14206242308b4be470af5d95b22ec361edbafc7e82789076a3dd011601f64800232f19e0b SHA512 3aecc004ccc34f1974a9d0d471add0424b3663fefa12a2a47b7312a73eb5ad6dba28cf075e73243c5740ee4a403b1e37f2a2cbe62c6c15cd3ea8e0b840e72021
-DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
-EBUILD qmail-ldap-1.03-r8.ebuild 5831 BLAKE2B 5a131aac335bafcc00ad6741a623f8c021cd21dd7af98828c06c9a9950b68eb9eeedd957f8467fda4a36aeca9d7058a3fe36e16d8deba724a7aa440b911ea99e SHA512 1bd3ee9c1edb180e5ae684c5bef75a8947dcec1cd01c5e060014f9c2b240147a84f75ab7732c56ea108f80eb97325bc80ae4405289ae8e9fedf7883b72e41553
-MISC metadata.xml 682 BLAKE2B 3efe1354c554a19e634b0275267ab10d199d3820bface5625902f8f9499fdbd4a04b547364e0c91eb55959432579aec8d00d173262879b6fa38f9486c795ca8a SHA512 def8025bb911da21196e23d2f19dafaa581aa712524ec2ee43e5f9dd95924c57eac395d22be9275a2c02fee03d5c4fd3ae40c1e448b701ee3bb9aa7a8488803b
diff --git a/mail-mta/qmail-ldap/files/1.03-warnings.patch b/mail-mta/qmail-ldap/files/1.03-warnings.patch
deleted file mode 100644
index 324d4b35730b..000000000000
--- a/mail-mta/qmail-ldap/files/1.03-warnings.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Files qmail-1.03.orig/auth_imap and qmail-1.03/auth_imap differ
-Files qmail-1.03.orig/auth_pop and qmail-1.03/auth_pop differ
-Files qmail-1.03.orig/auth_smtp and qmail-1.03/auth_smtp differ
-diff -NurpP qmail-1.03.orig/control.c qmail-1.03/control.c
---- qmail-1.03.orig/control.c	2008-04-06 19:06:15.683511000 +0000
-+++ qmail-1.03/control.c	2008-04-06 19:15:47.923622781 +0000
-@@ -1,3 +1,6 @@
-+#define _GNU_SOURCE 1
-+#include <string.h>
-+
- #include <unistd.h>
- #include "readwrite.h"
- #include "open.h"
-@@ -10,10 +13,6 @@
- #include "scan.h"
- #include "limit.h"
- 
--#if defined(USE_CONTROLDB) || defined(SECUREBIND_SASL) || defined(SECUREBIND_SSL) || defined(SECUREBIND_TLS) || defined(SECUREBIND_ALL)
--#include <string.h>
--#endif
--
- #ifdef USE_CONTROLDB
- #include <syslog.h>
- 
-@@ -48,7 +47,6 @@ int control_ldap_search(const char *fn, 
- 
- #if defined(SECUREBIND_SASL) || defined(SECUREBIND_SSL) || defined(SECUREBIND_TLS) || defined(SECUREBIND_ALL)
- #include <malloc.h>
--#include <string.h>
- #include <malloc.h>
- 
- #include "subfd.h"
-Files qmail-1.03.orig/control.o and qmail-1.03/control.o differ
-Files qmail-1.03.orig/pbsadd and qmail-1.03/pbsadd differ
-Files qmail-1.03.orig/pbscheck and qmail-1.03/pbscheck differ
-Files qmail-1.03.orig/pbsdbd and qmail-1.03/pbsdbd differ
-Files qmail-1.03.orig/qmail-forward and qmail-1.03/qmail-forward differ
-Files qmail-1.03.orig/qmail-group and qmail-1.03/qmail-group differ
-Files qmail-1.03.orig/qmail-inject and qmail-1.03/qmail-inject differ
-Files qmail-1.03.orig/qmail-ldaplookup and qmail-1.03/qmail-ldaplookup differ
-Files qmail-1.03.orig/qmail-lspawn and qmail-1.03/qmail-lspawn differ
-Files qmail-1.03.orig/qmail-newmrh and qmail-1.03/qmail-newmrh differ
-Files qmail-1.03.orig/qmail-pw2u and qmail-1.03/qmail-pw2u differ
-Files qmail-1.03.orig/qmail-qmqpc and qmail-1.03/qmail-qmqpc differ
-Files qmail-1.03.orig/qmail-qmtpd and qmail-1.03/qmail-qmtpd differ
-Files qmail-1.03.orig/qmail-queue and qmail-1.03/qmail-queue differ
-Files qmail-1.03.orig/qmail-quotawarn and qmail-1.03/qmail-quotawarn differ
-Files qmail-1.03.orig/qmail-remote and qmail-1.03/qmail-remote differ
-Files qmail-1.03.orig/qmail-reply and qmail-1.03/qmail-reply differ
-Files qmail-1.03.orig/qmail-secretary and qmail-1.03/qmail-secretary differ
-Files qmail-1.03.orig/qmail-send and qmail-1.03/qmail-send differ
-Files qmail-1.03.orig/qmail-showctl and qmail-1.03/qmail-showctl differ
-Files qmail-1.03.orig/qmail-smtpd and qmail-1.03/qmail-smtpd differ
-Files qmail-1.03.orig/qmail-todo and qmail-1.03/qmail-todo differ
-Files qmail-1.03.orig/qmail-verify and qmail-1.03/qmail-verify differ
diff --git a/mail-mta/qmail-ldap/files/samples.ldif b/mail-mta/qmail-ldap/files/samples.ldif
deleted file mode 100644
index c1a77c4d97ca..000000000000
--- a/mail-mta/qmail-ldap/files/samples.ldif
+++ /dev/null
@@ -1,32 +0,0 @@
-#ldapauth, better to use this than your rootdn for security reasons
-dn: uid=ldapauth,ou=People,dc=yhourhost,dc=net
-uid: ldapauth
-cn: ldapuath
-objectClass: account
-objectClass: posixAccount
-objectClass: top
-objectClass: shadowAccount
-shadowLastChange: 12116
-loginShell: /bin/true
-uidNumber: 11184
-gidNumber: 2110
-homeDirectory: /var/qmail/maildirs/
-gecos: ldap authorization,,,
-userPassword: libcrypt_format
-
-#sample user dn
-dn: uid=denverj ,ou=people,dc=yourhost,dc=net
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: qmailUser
-objectClass: person
-cn: John Denver
-givenName: denverj
-sn: denverj
-uid: denverj
-mail: denverj@yourhost.net
-mailMessageStore: /var/qmail/maildirs/denverj/Maildir/
-nohomeDirectory: /var/qmail/maildirs/denverj/
-mailAlternateAddress: denverj@alias.host.net
-userPassword: libcrypt_format
-
diff --git a/mail-mta/qmail-ldap/metadata.xml b/mail-mta/qmail-ldap/metadata.xml
deleted file mode 100644
index 7f6421c8f0b6..000000000000
--- a/mail-mta/qmail-ldap/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="cluster">Enable this if you want to have cluster support in
-			qmail-ldap</flag>
-		<flag name="gencertdaily">Generate SSL certificates daily instead of
-			hourly</flag>
-		<flag name="highvolume">Prepare qmail for high volume servers</flag>
-		<flag name="rfc2307">Add support for RFC2307 compliant uid/gid
-			attributes</flag>
-		<flag name="rfc822">Add support for RFC822 compliant mail
-			attributes</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">qmail-spp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r8.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r8.ebuild
deleted file mode 100644
index a2760f2ff327..000000000000
--- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r8.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-GENQMAIL_PV=20080406
-QMAIL_SPP_PV=0.42
-
-QMAIL_LDAP_PV=20060201
-QMAIL_LDAP_F=${P}-${QMAIL_LDAP_PV}.patch.gz
-
-QMAIL_LDAP_SPP_F=${P}-spp-${QMAIL_SPP_PV}.patch
-
-QMAIL_LDAP_CONTROLS_PV=20060401d
-QMAIL_LDAP_CONTROLS_F=${P}-${QMAIL_LDAP_PV}-controls${QMAIL_LDAP_CONTROLS_PV}.patch
-
-inherit eutils qmail
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
-HOMEPAGE="
-	http://www.qmail-ldap.org
-	http://cr.yp.to/qmail.html
-	http://qmail.org
-"
-SRC_URI="mirror://qmail/qmail-${PV}.tar.gz
-	https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-	http://www.nrg4u.com/qmail/${QMAIL_LDAP_F}
-	mirror://gentoo/${QMAIL_LDAP_CONTROLS_F}
-	mirror://gentoo/${P}-queue-custom-error.patch
-	!vanilla? (
-		qmail-spp? (
-			mirror://sourceforge/qmail-spp/${QMAIL_SPP_F}
-			mirror://gentoo/${QMAIL_LDAP_SPP_F}
-		)
-	)
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cluster debug gencertdaily highvolume qmail-spp rfc2307 rfc822 ssl vanilla zlib"
-RESTRICT="test"
-
-DEPEND="
-	!mail-mta/qmail
-	acct-group/nofiles
-	acct-group/qmail
-	acct-user/alias
-	acct-user/qmaild
-	acct-user/qmaill
-	acct-user/qmailp
-	acct-user/qmailq
-	acct-user/qmailr
-	acct-user/qmails
-	net-nds/openldap
-	net-mail/queue-repair
-	ssl? ( dev-libs/openssl )
-"
-RDEPEND="
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!mail-mta/ssmtp
-	>=sys-apps/ucspi-tcp-0.88-r17
-	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
-	virtual/daemontools
-	>=net-mail/dot-forward-0.71-r3
-	${DEPEND}
-"
-
-S="${WORKDIR}"/qmail-${PV}
-
-pkg_setup() {
-	if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-		eerror
-		eerror "The QMAIL_PATCH_DIR variable for custom patches"
-		eerror "has been removed from ${PN}. If you need custom patches"
-		eerror "you should create a copy of this ebuild in an overlay."
-		eerror
-		die "QMAIL_PATCH_DIR is not supported anymore"
-	fi
-}
-
-src_unpack() {
-	genqmail_src_unpack
-	use qmail-spp && qmail_spp_src_unpack
-
-	unpack qmail-${PV}.tar.gz
-
-	cd "${S}"
-
-	# main ldap patch
-	# includes: netqmail-1.05, EXTTODO, BIGTODO, TLS/SMTPAUTH, 0.0.0.0 fix
-	epatch "${DISTDIR}"/${QMAIL_LDAP_F}
-
-	# QmailLDAP/Controls patch
-	# includes: RFC2307/822 fixes
-	epatch "${DISTDIR}"/${QMAIL_LDAP_CONTROLS_F}
-	epatch "${FILESDIR}"/${PV}-warnings.patch
-
-	# fix libraries for controls patch
-	sed -i -e 's|NEWLDAPPROGLIBS=.*|& str.a|' Makefile
-
-	ht_fix_file Makefile*
-
-	if ! use vanilla; then
-		# Add custom bounce messages to qmail-queue
-		epatch "${DISTDIR}"/${P}-queue-custom-error.patch
-
-		# qmail-spp patch
-		use qmail-spp && epatch "${DISTDIR}"/${QMAIL_LDAP_SPP_F}
-	fi
-
-	# makefile options
-	local INCLUDES="-I/usr/include"
-	local LDAPLIBS="-L/usr/lib -lldap -llber"
-	local LDAPFLAGS="-DALTQUEUE -DEXTERNAL_TODO -DDASH_EXT -DSMTPEXECCHECK"
-	local CONTROLDB="-DUSE_CONTROLDB -DQLDAP_BAILOUT"
-	local SECUREBIND= RFCFLAGS=
-
-	use cluster    && LDAPFLAGS="${LDAPFLAGS} -DQLDAP_CLUSTER"
-	use highvolume && LDAPFLAGS="${LDAPFLAGS} -DBIGTODO"
-	use zlib       && LDAPFLAGS="${LDAPFLAGS} -DDATA_COMPRESS -D QMQP_COMPRESS"
-
-	use rfc2307    && RFCFLAGS="${RFCFLAGS} -DUSE_RFC2307"
-	use rfc822     && RFCFLAGS="${RFCFLAGS} -DUSE_RFC822"
-
-	use ssl        && SECUREBIND="-DSECUREBIND_TLS -DSECUREBIND_SSL"
-
-	# a lot of sed magic to get Makefile right
-	local EXP=
-
-	EXP="${EXP} s|^#LDAPINCLUDES=.*|LDAPINCLUDES=${INCLUDES}|;"
-	EXP="${EXP} s|^#LDAPLIBS=.*|LDAPLIBS=${LDAPLIBS}|;"
-	EXP="${EXP} s|^#LDAPFLAGS=.*|LDAPFLAGS=${LDAPFLAGS}|;"
-
-	EXP="${EXP} s|^#CONTROLDB=.*|CONTROLDB=${CONTROLDB}|;"
-	EXP="${EXP} s|^#RFCFLAGS=.*|RFCFLAGS=${RFCFLAGS}|;"
-	EXP="${EXP} s|^#SECUREBIND=.*|SECUREBIND=${SECUREBIND}|;"
-
-	# TODO: do we even need this with LDAP?
-	EXP="${EXP} s|^#SHADOWLIBS=.*|SHADOWLIBS=-lcrypt|;"
-
-	# automagic maildir creation
-	EXP="${EXP} s|^#\(MDIRMAKE=.*\)|\1|;"
-	EXP="${EXP} s|^#\(HDIRMAKE=.*\)|\1|;"
-
-	use debug && EXP="${EXP} s|^#\(DEBUG=.*\)|\1|;"
-	use zlib  && EXP="${EXP} s|^#ZLIB=.*|ZLIB=-lz|;"
-
-	if use ssl; then
-		EXP="${EXP} s|^#\(TLS=.*\)|\1|;"
-		EXP="${EXP} s|^#TLSINCLUDES=.*|TLSINCLUDES=${INCLUDES}|;"
-		EXP="${EXP} s|^#TLSLIBS=.*|TLSLIBS=-L/usr/lib -lssl -lcrypto|;"
-		EXP="${EXP} s|^#OPENSSLBIN=.*|OPENSSLBIN=/usr/bin/openssl|;"
-	fi
-
-	qmail_src_postunpack
-
-	sed -i -e "${EXP}" Makefile || die "could not patch Makefile"
-}
-
-src_compile() {
-	qmail_src_compile ldap
-	use qmail-spp && qmail_spp_src_compile
-}
-
-qmail_full_install_hook() {
-	insinto ${QMAIL_HOME}/bin
-	insopts -o root -g qmail -m 0755
-	doins auth_smtp condwrite digest dirmaker pbs{add,check,dbd} \
-		qmail-{forward,group,quotawarn,reply,secretary,verify}
-
-	insopts -o root -g root -m 0750
-	doins qmail-ldaplookup
-
-	insopts -o root -g qmail -m 0711
-	doins qmail-todo
-
-	insopts -o root -g qmail -m 0700
-	doins auth_{imap,pop} qmail-cdb
-}
-
-qmail_man_install_hook() {
-	dodoc EXTTODO POPBEFORESMTP QLDAP* "${FILESDIR}"/samples.ldif
-}
-
-qmail_config_install_hook() {
-	einfo "Installing OpenLDAP schema"
-	insinto /etc/openldap/schema
-	doins qmail.schema qmail-ldap-control/qmailControl.schema
-}
-
-src_install() {
-	qmail_src_install
-}
-
-pkg_postinst() {
-	qmail_queue_setup
-	qmail_rootmail_fixup
-	qmail_tcprules_build
-
-	qmail_config_notice
-	qmail_supervise_config_notice
-	elog
-	elog "If you are looking for documentation, check those links:"
-	elog "http://www.lifewithqmail.com/ldap/"
-	elog "  -- Life with qmail-ldap"
-	elog
-	elog "For sample ldifs, please check /usr/share/doc/${PF}/"
-	elog
-}
-
-pkg_preinst() {
-	qmail_tcprules_fixup
-}
-
-pkg_config() {
-	# avoid some weird locale problems
-	export LC_ALL=C
-
-	qmail_config_fast
-	qmail_tcprules_config
-	qmail_tcprules_build
-
-	use ssl && qmail_ssl_generate
-}
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 263cb9241138..39504ef9af40 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -13,5 +13,5 @@ AUX sm-client.service 418 BLAKE2B a9057cac008c11d3cfd5a4b662cf3fc71a33be79e8890a
 DIST sendmail.8.14.9.tar.gz 2114293 BLAKE2B 51c24478724a1dd87e3bbda0bf0e8c9c64bc8f36eaa624752eda50942520a4f19262d2c8cebbb0a02467bb3f49e1e7edd78a69f0327effa3834e4234b289f04c SHA512 a541fe687e9967fb87f2f6c6263ecc698aac42c6a52e81e7ee556f0c3d719b9c996dfccf10cc2e0e5c6d03dd8d3ce79b856b78ca049dd47665e38c77763fa424
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
 EBUILD sendmail-8.14.9.ebuild 7038 BLAKE2B 61e6ba9e7b36ae1dfc4e733cd201c50c8655a57184e8d092a9282bbb8db33d636622978df6241897ef8246cb21d5f13a9536313898b937e51753aeec3654719b SHA512 1039f0200eb87e2c5c8f0416f0a512584932bd21bb1f3b7aeb8cef7c8b9e779c7ff4c376018eaa89a1105057a38d6ce063b291e0cec612dc3fc8f1a583b224f1
-EBUILD sendmail-8.15.2-r2.ebuild 7221 BLAKE2B 0bbea206d7a28f15b4a52de92a39b77c7b5551a09517fabb4f711e51b44d5b1d755754ef7662814952cdb4bf5451808b6108e4ae21a6821a11925dcdcf2f4463 SHA512 f9eae9d05454b5b4fadc5dc8d7782350092c98fdeb7bf68d5708561f4666a0f034aca4a521539727101ee2a2ddc90f2ddbeda01927068c2612b932436038056a
+EBUILD sendmail-8.15.2-r2.ebuild 7220 BLAKE2B 90e8389e32a1833494a08b29df4e5fede584e9f865ca60e0e529e7e656b8007e1d0909ef1d7058687f3b942fe1586134fd9964b2876ca33711ec4e8b065f6232 SHA512 795bbcad709daf5c8fc2e7e2f1e8a590416798497e4dd3d3bf35913ff12d92da22b2a4a9dce61469747052537a880b1cbd6d759f03e2d72233863ea213e629f2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
index 6ce95290069b..ba311e899ed4 100644
--- a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
+++ b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
 
 LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ssl ldap libressl sasl tcpd mbox ipv6 nis sockets"
 
 DEPEND="net-mail/mailbase