commit:     41c3137131f3c139d46630694a8e96474c24e6c8
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  8 05:43:17 2019 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Thu Aug  8 05:43:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c31371

mail-mta/postfix: remove old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 mail-mta/postfix/Manifest                          |   3 -
 .../postfix/files/postfix-libressl-eccurve.patch   |  16 -
 .../postfix/files/postfix-libressl-runtime.patch   | 102 -------
 .../files/postfix-libressl-session-tickets.patch   |  11 -
 mail-mta/postfix/files/postfix-libressl.patch      |  17 --
 mail-mta/postfix/files/postfix-linux-5.patch       |  23 --
 mail-mta/postfix/postfix-3.2.4.ebuild              | 308 --------------------
 mail-mta/postfix/postfix-3.3.1-r1.ebuild           | 300 -------------------
 mail-mta/postfix/postfix-3.3.4.ebuild              | 309 --------------------
 mail-mta/postfix/postfix-3.4.5.ebuild              | 324 ---------------------
 10 files changed, 1413 deletions(-)

diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index b94bafd3271..23ba1de0693 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 7ce14fd17ad..00000000000
--- 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 814088610a8..00000000000
--- 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 fcbc9df63ac..00000000000
--- 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 ce047b76039..00000000000
--- 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 a806ab0dbb9..00000000000
--- 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 26ce14a75ba..00000000000
--- 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
-       !>=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 <robb...@gentoo.org> 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 a171b99951a..00000000000
--- 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
-       !>=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 <robb...@gentoo.org> 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 0cd7f819f75..00000000000
--- 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
-       !>=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 <robb...@gentoo.org> 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 6b1a50eca24..00000000000
--- 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
-       !>=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 <robb...@gentoo.org> 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 '<mail-mta/postfix-3.4'; then
-               elog
-               elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
-               elog "with type 'unix-dgram' that is used by the new 
postlogd(8) daemon."
-               elog "Before backing out to an older Postfix version, edit the 
master.cf"
-               elog "file and remove the postlog entry."
-               elog
-       fi
-}
-
-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
-}

Reply via email to