summaryrefslogtreecommitdiff
path: root/mail-mta
diff options
context:
space:
mode:
Diffstat (limited to 'mail-mta')
-rw-r--r--mail-mta/Manifest.gzbin2548 -> 2381 bytes
-rw-r--r--mail-mta/courier/Manifest6
-rw-r--r--mail-mta/courier/courier-1.0.14.ebuild2
-rw-r--r--mail-mta/courier/courier-1.0.5.ebuild2
-rw-r--r--mail-mta/courier/courier-1.1.2.ebuild313
-rw-r--r--mail-mta/esmtp/Manifest2
-rw-r--r--mail-mta/esmtp/esmtp-1.2-r2.ebuild48
-rw-r--r--mail-mta/esmtp/files/esmtp-1.2-pkgconfig.patch29
-rw-r--r--mail-mta/nullmailer/Manifest4
-rw-r--r--mail-mta/nullmailer/metadata.xml4
-rw-r--r--mail-mta/nullmailer/nullmailer-2.2-r1.ebuild4
-rw-r--r--mail-mta/postfix/Manifest8
-rw-r--r--mail-mta/postfix/postfix-3.5.10.ebuild319
-rw-r--r--mail-mta/postfix/postfix-3.6.0_rc1.ebuild289
-rw-r--r--mail-mta/postfix/postfix-3.6_pre20210422.ebuild (renamed from mail-mta/postfix/postfix-3.6_pre20210224.ebuild)0
-rw-r--r--mail-mta/protonmail-bridge-bin/Manifest7
-rw-r--r--mail-mta/protonmail-bridge-bin/metadata.xml20
-rw-r--r--mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.4.5.ebuild249
-rw-r--r--mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.5.0.ebuild249
-rw-r--r--mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.5.2.ebuild249
-rw-r--r--mail-mta/protonmail-bridge/Manifest12
-rw-r--r--mail-mta/protonmail-bridge/protonmail-bridge-1.6.9.ebuild (renamed from mail-mta/protonmail-bridge/protonmail-bridge-1.6.3.ebuild)34
-rw-r--r--mail-mta/qpsmtpd/Manifest4
-rw-r--r--mail-mta/qpsmtpd/qpsmtpd-0.95-r1.ebuild (renamed from mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild)30
-rw-r--r--mail-mta/qpsmtpd/qpsmtpd-9999.ebuild30
-rw-r--r--mail-mta/ssmtp/Manifest2
-rw-r--r--mail-mta/ssmtp/ssmtp-2.64-r4.ebuild (renamed from mail-mta/ssmtp/ssmtp-2.64-r3.ebuild)73
27 files changed, 1112 insertions, 877 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 9e4303eda9bf..bb917b510323 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
Binary files differ
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 7e4f7b7a06b0..72d8d97a271b 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -6,8 +6,10 @@ DIST courier-1.0.13.tar.bz2 7533779 BLAKE2B 38db2127df3f9d0371ee01563663ebabefdf
DIST courier-1.0.14.tar.bz2 7541652 BLAKE2B 5ddaabcfc49d5681b884311187eae04e492e273040dde6af83ab7ac4af117010be61c916cd909a686477c84997ca64cc435c1415f431c42c220c026d581e17da SHA512 7d66368745f3afdef0e1f4bd8078617203d7b846c96d499575daa07644ed5f800ff76e9c145f22010a677a5b754e4d4f300d95bc3f7d3a60a54271f284f80b5c
DIST courier-1.0.17.tar.bz2 7644893 BLAKE2B c31a5f9b27119b0affc7fe3b66da8d35534f519c8ade77b5e59e0b08f92f143b54d519ef0f726b1e68f900e8f330811befb7f2d626de041ebee53be25e089bbe SHA512 588415d1062581ba7fef64eb884c129e4802d90f6e6bf583e249c6e83e62ec90dbc7ccc0e6e9ce4697c00a4c66b10b84bfc6121854fa7abacd613010f34936d6
DIST courier-1.0.5.tar.bz2 7465054 BLAKE2B 55e9ba2a85889e7210652475149f4d3e687fd63a27b44a5a16c888b2f60bb18c4156e3344792585fed2ee3d81770e79c55ce5791842c255b8701bad5d2f8af4e SHA512 99a8e98633da99abd1f6f4e24328d4655526d51dc9fc03ffcb9c1e0cce0e608dedb2ac9511829af4487ff5af4618500d6fbbee26568f2a05e3c9d3cf3b48b2a5
+DIST courier-1.1.2.tar.bz2 7652292 BLAKE2B 3d5ded14e3972532abd86bdd9d2a144dc907d6e0d1300dcc5395fcc36984bc619453e612c4c2b504fd06cdbea44ce9cd70227e5b122445704df3ba852cdc5594 SHA512 e0267acae90e792a8813b189296a599c4e27337bd5952d311cc99b068b628d4c0c6e0ae4c6ccb03fd6ada4d0a9cb362c59a7a21833177301a830fcb4c437abfd
EBUILD courier-1.0.13.ebuild 9285 BLAKE2B 688c8dd0b199c24aa50efc99bbb2fe04711e7f0533b3f976705e92624661c67d9f0e20fed7a17c58c8eb124c25c9106f9c84b96f7826b7c6e68bba7c8eaf6766 SHA512 255d573038665431489a019667539da15c2daeb60f4dc6cfe026bbe33ad09fc92f423e50e12dd306aff360a1ffea2393df8ba500f5140ac87e2e3886f03e3f92
-EBUILD courier-1.0.14.ebuild 9278 BLAKE2B 8385103633aaa108ea66d581e7d2e96179cac179bfda591866013ea04660e13beb7d196ccff7da5e1868708a91930fce04869bd9f6ebdee40e1aa19424b043a5 SHA512 506c6e398092a235588317b8541ca581c0238b1bf50ee2eb90afa22c8c9de66c1c5e976d5d9e3a71692902891d0e82b6b5b25aa73590a3ed3dfa1577497e464a
+EBUILD courier-1.0.14.ebuild 9279 BLAKE2B 26de200aa8bf4864f64e485d3436d682209b193cfc9c28280d0a9cdc1d1edb29fbcd126aa2c486c2a21742141321d73b6f2cd79360b226ce18d1393b388cb31d SHA512 6a0dc478d8518a6e510c308d59c486a332150891c6352d725096939cc0a5c8c1033d0f71b88ca99c5ee6fc911b5aaba07c3473764cfbd059952f1c21d21ff720
EBUILD courier-1.0.17.ebuild 9287 BLAKE2B 807bfd85ae2d42fd96f0375d1b5daa6d80f8431a164f09e04d31175032ad8b76b96df32b09fc1de564bd13252993e06cc1b09cda6b44733df72351f7890ed27b SHA512 8b5e27f4b405c4783b7a5756a87de776bde3d5aa27b8e0ce6b18b3097ad54dd40922df28b2f07498d8bf85586d6267abef8662cf5271259dfe1c88b4ebfc5944
-EBUILD courier-1.0.5.ebuild 9503 BLAKE2B 5be1c369130e005a3ce038ebfe5fe0015ee3f09d77c124dbe78badb88132683a7baa90f0a7878d8e82f71f57b91e95c450b2e552468dad294b15c83d9b7bb82e SHA512 7e4a2c5b15ebbe992e2d9fe230e6c024d0de03e55197558bbcd1fbbaa0f49770babaa3301b177ab325c9ed3f539bb82fb5dded3b134e4e227e4f7ee3378c0542
+EBUILD courier-1.0.5.ebuild 9504 BLAKE2B 2b1d9a4ea96668b9ac8b3dc866bc6177e25faaa61a0d1fd4cb9b40d9467a1a33e27239b7749e10431f2845be36f2000106a719170ab4559ecacfff3e74fc5352 SHA512 77294bc3dc2ff842f17da380abb7a4f79ba054f2478af3352ce6b0e4600568c40ac4e6b0dd63ad36330c2f73a7d08aaad16aa8c34605a3a656ab1aac9aec9fcb
+EBUILD courier-1.1.2.ebuild 9287 BLAKE2B 003a8c5478b5a827fba4dd800fb1959d90cfe7132d271aa82b2cb0ab20b0a9701e335bf9d4f509adf0d76f3b18b6e5f5cde042575ac2a2fd9b1469a277e540d6 SHA512 17841aa43d355dd30c5557a11cffd6f10cf67e4ad0621ecf0aae0bc46f16a6b7e6e06efc0aa667ab6b2fce309fd65afbdbc9218901a50a37abe5289e9935d4bf
MISC metadata.xml 755 BLAKE2B 8ec0dd31ad59193d95585ab88f0bac6ced87132444a4136b2c2f80458a11f5296c42283574c3b56c26a31dad25fff530ebbfbf1ef467a1b824d11afe93a6da31 SHA512 de15af05e98deba4d3b297b4301439d892c3ba0d8af30ca459fcac72bf0179de87bf11260b8bfdb3827dd1f0e5123d68817766ffe037cece9c30adb3e8bd8b06
diff --git a/mail-mta/courier/courier-1.0.14.ebuild b/mail-mta/courier/courier-1.0.14.ebuild
index 795a78c203b9..4ad365ca157f 100644
--- a/mail-mta/courier/courier-1.0.14.ebuild
+++ b/mail-mta/courier/courier-1.0.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
fam web webmail gnutls"
diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild
index 470c2a9a78fe..243d53af7dea 100644
--- a/mail-mta/courier/courier-1.0.5.ebuild
+++ b/mail-mta/courier/courier-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
fam web webmail gnutls"
diff --git a/mail-mta/courier/courier-1.1.2.ebuild b/mail-mta/courier/courier-1.1.2.ebuild
new file mode 100644
index 000000000000..c62aaf446196
--- /dev/null
+++ b/mail-mta/courier/courier-1.1.2.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
+ fam web webmail gnutls"
+
+DEPEND="
+ >=net-libs/courier-authlib-0.71.2
+ >=net-libs/courier-unicode-2.2.3
+ net-dns/libidn:=
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ >=sys-libs/gdbm-1.8.0
+ dev-libs/libpcre
+ app-misc/mime-types
+ fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
+ pam? ( sys-libs/pam )
+ mysql? ( dev-db/mysql-connector-c )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ postgres? ( dev-db/postgresql:= )
+ spell? ( app-text/aspell )
+ fam? ( virtual/fam )
+ !mail-filter/maildrop
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/postfix
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/ssmtp[mta]
+ !mail-mta/opensmtpd
+ !net-mail/dot-forward
+ !sys-apps/ucspi-tcp
+ "
+
+RDEPEND="${DEPEND}
+ dev-lang/perl
+ sys-process/procps"
+
+# get rid of old style virtual/imapd - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+ !net-mail/bincimap
+ !net-mail/courier-imap
+ !net-mail/cyrus-imapd
+ !net-mail/uw-imap"
+
+PDEPEND="pam? ( net-mail/mailbase )
+ crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+src_prepare() {
+ use norewrite && eapply "${FILESDIR}/norewrite.patch"
+ default
+}
+
+src_configure() {
+ filter-flags '-fomit-frame-pointer'
+
+ local myconf
+ myconf=""
+
+ use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+
+ econf ${myconf} \
+ $(use_with fam) \
+ $(use_with ipv6) \
+ $(use_with spell ispell) \
+ $(use_with ldap ldapaliasd) \
+ $(use_enable ldap maildroldap) \
+ $(use_with gnutls) \
+ --with-notice=unicode \
+ --enable-mimetypes=/etc/mime.types \
+ --prefix=/usr \
+ --disable-root-check \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc/courier \
+ --datadir=/usr/share/courier \
+ --sharedstatedir=/var/lib/courier/com \
+ --localstatedir=/var/lib/courier \
+ --with-piddir=/var/run/courier \
+ --with-authdaemonvar=/var/lib/courier/authdaemon \
+ --with-mailuser=mail \
+ --with-mailgroup=mail \
+ --with-paranoid-smtpext \
+ --with-db=gdbm \
+ --disable-autorenamesent \
+ --cache-file="${S}/configuring.cache" \
+ --host="${CHOST}" debug=true || die "./configure"
+ sed -e'/^install-perms-local:/a\ sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
+}
+
+src_compile() {
+ default
+}
+
+etc_courier() {
+ # Import existing /etc/courier/file if it exists.
+ # Add option only if it was not already set or even commented out
+ file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
+ [ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
+ cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
+ grep -q "${word}" "${D}/etc/courier/${file}" || \
+ echo "${2}" >> "${D}/etc/courier/${file}"
+}
+
+etc_courier_chg() {
+ file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
+ [ -z "${section}" ] && section="${2}"
+ grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+ sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+src_install() {
+ local f
+ diropts -o mail -g mail
+ keepdir /var/lib/courier/tmp
+ keepdir /var/lib/courier/msgs
+ make install DESTDIR="${D}" || die "install"
+ make install-configure || die "install-configure"
+
+ # init script takes care of this
+ rm -rf "${D}/var/run"
+
+ # Get rid of files we dont want
+ if ! use webmail ; then
+ rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
+ "${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
+ "${D}/usr/share/courier/sqwebmail/" \
+ "${D}/usr/sbin/webmaild" \
+ "${D}/usr/sbin/webgpg" \
+ "${D}/etc/courier/webmail.authpam" \
+ "${D}/var/lib/courier/webmail-logincache" \
+ "${D}"/etc/courier/sqwebmaild*
+ fi
+
+ if ! use web ; then
+ rm -rf "${D}/usr/share/courier/courierwebadmin/" \
+ "${D}/etc/courier/webadmin"
+ fi
+
+ for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
+ keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
+ done
+
+ newinitd "${FILESDIR}/courier-init-r4" "courier"
+ use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
+
+ cd "${D}/etc/courier"
+ if use webmail ; then
+ insinto /etc/courier
+ newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
+ fi
+
+ for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
+ if use ldap ; then
+ [ -e ldapaliasrc ] && ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc )
+ else
+ rm -f ldapaliasrc
+ fi
+
+ ( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
+ > "${D}/etc/courier/sizelimit"
+ etc_courier maildroprc ""
+ etc_courier esmtproutes ""
+ etc_courier backuprelay ""
+ etc_courier locallowercase ""
+ etc_courier bofh "opt BOFHBADMIME=accept"
+ etc_courier bofh "opt BOFHSPFTRUSTME=1"
+ etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
+ etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
+ etc_courier bofh "opt BOFHSPFFROM=all"
+ etc_courier bofh "opt BOFHSPFMAILFROM=all"
+ etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
+ etc_courier esmtpd "BOFHBADMIME=accept"
+ etc_courier esmtpd-ssl "BOFHBADMIME=accept"
+ etc_courier esmtpd-msa "BOFHBADMIME=accept"
+
+ use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+ use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
+
+ # Fix for a sandbox violation on subsequential merges
+ # - ticho@gentoo.org, 2005-07-10
+ dosym ../share/courier/pop3d /usr/sbin/courier-pop3d
+ dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+ dosym ../share/courier/imapd /usr/sbin/courier-imapd
+ dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+ cd "${S}"
+ cp imap/README README.imap
+ use nls && cp unicode/README README.unicode
+ dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
+ dodoc libs/tcpd/README.couriertls
+ mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
+
+ if use webmail ; then
+ insinto /usr/$(get_libdir)/courier/courier
+ insopts -m 755 -o mail -g mail
+ doins "${S}/courier/webmaild"
+ fi
+
+ if use web ; then
+ insinto /etc/courier/webadmin
+ insopts -m 400 -o mail -g mail
+ doins "${FILESDIR}/password.dist"
+ fi
+
+ # avoid name collisions in /usr/sbin, make webadmin match
+ cd "${D}/usr/sbin"
+ for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
+ if use web ; then
+ sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
+ -e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
+ "${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
+ || ewarn "failed to fix webadmin"
+ sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
+ -e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
+ "${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
+ || ewarn "failed to fix webadmin"
+ fi
+
+ # users should be able to send mail. Could be restricted with suictl.
+ chmod u+s "${D}/usr/bin/sendmail"
+
+ dosym ../bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+ if [ `whoami` != 'root' ]; then
+ emake -j1 check
+ else
+ einfo "make check skipped, can't run as root."
+ einfo "You can enable it with FEATURES=\"userpriv\""
+ fi
+}
+
+pkg_postinst() {
+ use fam && elog "fam daemon is needed for courier-imapd" \
+ || ewarn "courier was built without fam support"
+}
+
+pkg_config() {
+ mailhost="$(hostname)"
+ export mailhost
+
+ domainname="$(domainname)"
+ if [ "x$domainname" = "x(none)" ] ; then
+ domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
+ fi
+ export domainname
+
+ if [ "${ROOT}" = "/" ] ; then
+ file="${ROOT}/etc/courier/locals"
+ if [ ! -f "${file}" ] ; then
+ echo "localhost" > "${file}";
+ echo "${domainname}" >> "${file}";
+ fi
+ file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
+ if [ ! -f "${file}" ] ; then
+ echo "${domainname}" > "${file}"
+ /usr/sbin/makeacceptmailfor
+ fi
+
+ file="${ROOT}/etc/courier/smtpaccess/${domainname}"
+ if [ ! -f "${file}" ]
+ then
+ netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
+ do
+ i=1
+ net=""
+ TIFS="${IFS}"
+ IFS="."
+ for o in "${netmask}"
+ do
+ if [ "${o}" == "255" ]
+ then
+ [ "_${net}" == "_" ] || net="${net}."
+ t="$(echo "${network}" | cut -d " " -f ${i})"
+ net="${net}${t}"
+ fi
+ i="$((${i} + 1))"
+ done
+ IFS="${TIFS}"
+ echo "doing configuration - relay control for the network ${net} !"
+ echo "${net} allow,RELAYCLIENT" >> ${file}
+ done
+ /usr/sbin/makesmtpaccess
+ fi
+ fi
+
+ echo "creating cert for esmtpd-ssl:"
+ /usr/sbin/mkesmtpdcert
+ echo "creating cert for imapd-ssl:"
+ /usr/sbin/mkpop3dcert
+ echo "creating cert for pop3d-ssl:"
+ /usr/sbin/mkimapdcert
+}
diff --git a/mail-mta/esmtp/Manifest b/mail-mta/esmtp/Manifest
index 8b78beff857a..27b62454b124 100644
--- a/mail-mta/esmtp/Manifest
+++ b/mail-mta/esmtp/Manifest
@@ -1,3 +1,5 @@
+AUX esmtp-1.2-pkgconfig.patch 761 BLAKE2B f3e041ad29b73b456f88771f67f0614dffe5da9e99f60465d9720adde27f8f84ab27b667cf04c12b8f1cc0c229500b747fe4ab456566eddc59001b41cf30f048 SHA512 ada3444f7ac1f1fa1a62f33444ab135ee6e1cc477cd740fe57a8313abf4d43d0651a0495207de5eef98875a05ac860e6556a6f3a19646d08a3876b11521a5f02
DIST esmtp-1.2.tar.bz2 127921 BLAKE2B 09823dace39d3fa7d525b85e33e6e64497ef81a6e2b4b1f3682e0576511b845c7cdf50602d6b1acd6d777ca34581d3727a337ff8cb7e737f278983c06fc8773c SHA512 a1e7b56743ba32b1778bf02d0abcbdb5e6e3cb7d592c3a23a575789de60dfd62a307d4aef06860c9553cc492cdde0fff0a42de53e9d4e972587a10f609be4821
EBUILD esmtp-1.2-r1.ebuild 940 BLAKE2B 099402570bd18146d4a1e9c26f7beeb06e919500e5f5ee8f3a153fc1aec9713d392e5c79be73eb85aa3fe8e5e33837afe592c7cab6dd11d94fa833caeeddb789 SHA512 f054e39ce72312b8f9b7d3e991cc6e5df57d891831dfeba61b6078e5c4d1a502b8131298006024ea318bfdd1d33c37bb2c1149a544724d564e34b8b7f1af7d87
+EBUILD esmtp-1.2-r2.ebuild 994 BLAKE2B cebbfeb4998699a4d64a6ac27166c037caf643e6a3b0354389ef95743fc0cae0404017a67fef53008d8bce6af3ff09d4ca8a46f59e85ad9a8ed2d7d189f47dd7 SHA512 82fcb3e3ea85c975abe6e0e3d5c247b37b256e163f6491cddb56214af650d6e815cec4f2dfac0a1403db3a305877ed4916e6ae7989c49f05d004a1b58ad6ce4e
MISC metadata.xml 242 BLAKE2B 041399005c131e6e66967025968669f0ddb0972aa213f52e81852518a0005b7c478debfb6bc182443bb6a35066ebd6d3049c99d7b8e4a6272fd95960504e4d74 SHA512 8d906d3c3f37a584908f69913417a2c54ef0cde2709d7f2f88d25b932bfa18f98014a34f83d9ebd73f0508e324747ee48f412d909a0423892069fa9f03b78f37
diff --git a/mail-mta/esmtp/esmtp-1.2-r2.ebuild b/mail-mta/esmtp/esmtp-1.2-r2.ebuild
new file mode 100644
index 000000000000..af0fec0f53e2
--- /dev/null
+++ b/mail-mta/esmtp/esmtp-1.2-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="User configurable relay-only Mail Transfer Agent with a sendmail-like syntax"
+HOMEPAGE="http://esmtp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ dev-libs/openssl:0=
+ >=net-libs/libesmtp-1.0.6_p20200824:=
+ !mail-mta/courier
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/postfix
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/ssmtp
+ !mail-mta/opensmtpd
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2-pkgconfig.patch" )
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO sample.esmtprc )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+pkg_postinst() {
+ elog "A sample esmtprc file has been installed in /usr/share/doc/${PF}"
+}
diff --git a/mail-mta/esmtp/files/esmtp-1.2-pkgconfig.patch b/mail-mta/esmtp/files/esmtp-1.2-pkgconfig.patch
new file mode 100644
index 000000000000..a96566a6f520
--- /dev/null
+++ b/mail-mta/esmtp/files/esmtp-1.2-pkgconfig.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/782709
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,21 +28,14 @@ then
+ CPPFLAGS="$CPPFLAGS -I$with_libesmtp/include"
+ LDFLAGS="$LDFLAGS -L$with_libesmtp/lib"
+ AC_CHECK_HEADER(libesmtp.h, ,[AC_MSG_ERROR([libesmtp.h not found in $with_libesmtp])])
+-fi
+-AC_MSG_CHECKING(for libESMTP)
+-if libesmtp-config --version > /dev/null 2>&1
+-then
+- AC_MSG_RESULT(yes)
+- CFLAGS="$CFLAGS `libesmtp-config --cflags`"
+- LIBS="$LIBS `libesmtp-config --libs`"
+-else
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR(libESMTP library not found)
+ fi
+
++PKG_CHECK_MODULES([libesmtp], [libesmtp-1.0])
++CFLAGS="$CFLAGS ${libesmtp_CFLAGS}"
++LIBS="$LIBS ${libesmtp_LIBS}"
++
+ jrf_FUNC_GETOPT
+
+ AC_CHECK_FUNCS([getuid geteuid])
+-
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index d21e76834f6f..db9aed50d792 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -4,5 +4,5 @@ AUX nullmailer-2.2-disable-smtp-auth-tests.patch 2383 BLAKE2B 07f2fc7517df280fac
AUX nullmailer-2.2-fix-test-racecondition.patch 890 BLAKE2B 7d12af8a9b6071f11e70c6aedbe0471f042c2c2e611eedf768071715b7f42a94b2b41e814a87dd87777810cbb823d20138d40f6aa3aba93ebaec89ebb6d9e2f3 SHA512 10873e538dbc89e8899047e732515d30108b25fd0ff6bb2fc695f5790a94ac32629f41c470a2fec951357169fead36ee4512f543ad0e02c52f09799334b815c7
AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354
DIST nullmailer-2.2.tar.gz 257740 BLAKE2B 18821caa1a377a899e3fedc84530d7c672f345cafb627da05e6c7bcd7d2708d54fc4ff4b761a6a23b2ddbabe73514473a5ec2abf3182dce2f5d3d4fbe3618fed SHA512 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268
-EBUILD nullmailer-2.2-r1.ebuild 4284 BLAKE2B a93914f24430536d74fd00d9698f85945c8facb849051175b422a3546742180ac6cbb7c08462e95922ca1992644bc18f5dd01394aa0280bd60e80c70a17a5592 SHA512 2e0a0228c72e06809d24a1596a955514df4909dd228e493a56c8e87443ef20601554b2b22d77d6bdfc8b25bee92e67fa07763bcee45bab6afd27e716d1248f1f
-MISC metadata.xml 462 BLAKE2B 6bb4c3b64b2a26224d66df58a133e26bec2c8db7069f5f94b131c4b09387d707a8d5170f0581c9c5136e79af4b97b5f5c3ca4a649171497957ef4aef4312a2cd SHA512 d1370220b0d410947a347c71c9dca8070b3c4a28a82742f618f605be86099ffd37dce1a7d6ab706248eae290aaaf8de2df57c5b3c8f8e818464b9eb5d26d7719
+EBUILD nullmailer-2.2-r1.ebuild 4277 BLAKE2B 652af150e6d5cdca2eac94ee4e37f447e857879b7ff3ca165fbbc9784706eedd4ff8b1e55122692b864e5e0e19a0ab490265d8c39f645291bf4f2aa5ad93330f SHA512 fbebb5b430234dd4d6c3cfbe272dff0561f0087230adf240603145f0bfe27188960df267688bf612b36db44b383c022f1339351c9576e969e050d4ac5af264a0
+MISC metadata.xml 342 BLAKE2B ac05adbff1c06a41efb8b6c01995d7061302e3e829fa07008538aef00de9ef00e8e665a2d45e51e0886d092a9f492ac1cb194f9ab614b944147f9a8235608c71 SHA512 bde55b4d0d452321cab14b1f38dcf2f27caa6586acc1748b9be1cb6981c0e4e90e909129d3700f49a7405f8baba80c3182d6ce84c75260a87019e8be593bc091
diff --git a/mail-mta/nullmailer/metadata.xml b/mail-mta/nullmailer/metadata.xml
index 110d077c53d1..ead06a9996fe 100644
--- a/mail-mta/nullmailer/metadata.xml
+++ b/mail-mta/nullmailer/metadata.xml
@@ -5,10 +5,6 @@
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
- <maintainer type="person">
- <email>haubi@gentoo.org</email>
- <name>Michael Haubenwallner</name>
- </maintainer>
<upstream>
<remote-id type="github">bruceg/nullmailer</remote-id>
</upstream>
diff --git a/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild b/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
index 4ffe7cc5126b..1835317ed6c2 100644
--- a/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
+++ b/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools eutils flag-o-matic multilib systemd user
+inherit autotools flag-o-matic multilib systemd user
DESCRIPTION="Simple relay-only local mail transport agent"
HOMEPAGE="http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer"
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index d5951ac48303..d9bb10c6b2d2 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -4,10 +4,14 @@ AUX postfix.rc6.2.7 2107 BLAKE2B 291d9e02ffdac79a1c7c64febc5674321e675de341b468b
AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d38f195227190b73cf0fb41cd68a86e97cfe844cc7f9f095cba0a17afe9ce7c8697e0aa30f5faecde6 SHA512 04b475040b153f488a9358567ff9ee2eb8f263c619dadc23c837d17c19106041296e3652bcaded2be0c7c8b9eee7fd5f2ad55bed3e7f9b3a4bf9655f4762d563
AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
+DIST postfix-3.5.10.tar.gz 4621130 BLAKE2B 32a0ef43131c1bff319fb8a159e78a4fd81aba85aa2c8aab3020d575e6216a1e5fb4612a4aa3693b62de5825a29bf5ea1c1870835f033569a5d2d3e494306ef1 SHA512 5845701d3dcdaaea376a44810a84dbe908e96e5ff54921cd40fd2d5c5643ed8e4add5936e149237fea4cb69c1ffb4ceb4171d1e779be096aa21a6e5021b604da
DIST postfix-3.5.8.tar.gz 4614733 BLAKE2B 13166e854f70987f981bb5e7e5dabfaa73b3170ab16fc1ff8f70f6b98a0697ac980bdf74bbfb39fdfd1972f922a31a28882b1575b79fd8f01d81e08e68d756bc SHA512 0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b
DIST postfix-3.5.9.tar.gz 4620852 BLAKE2B 66a7bd71e7f74c8f25963ed8d41f04f1f95e060fd23c848065a0e947e766efe058e6593ed8ce1f69528f5b2e9868756d0ea0622b3d77486852882622dd3bb872 SHA512 9ff3a33cdd5811e470d5c6cfa896fa76e4d3257b139deec5f420d18e34232f327b7c8496c5d13566c6f9ae1fdf8719feb9981372b2869b0208a2eb3a1daaeadd
-DIST postfix-3.6-20210224.tar.gz 4736857 BLAKE2B bfd684a47825fbb40073ecfde79fe9f0099d2b976d139531cacb0357caf19b6b96c57dbba956723aaff054c543e1d5fa0f452085c41927119357dde1472b8db3 SHA512 43ca7a6ed18114faa6ef86d34240c731fd797e239004490ecc7fd587a76a97105aea5d7096cb9c94d705e85f93600cae9cd34dec622bf9318440c0978999b04c
+DIST postfix-3.6-20210422.tar.gz 4737710 BLAKE2B 5559115e14922f1692ab193e06f5aa4097c6d82c2b693bef39858a9284177c381c32db81ac686f055fe2c516223dc223a1cad607ef79bddcef059e382bf5d3ed SHA512 6cb3d101d5f9aee786ca131432ed6aaaffe4c225f207b538e9dc2bd765b4c4e67c4751506b8cca6f9867fe4aee0a18ed703fd7006160b2fdfe1a4d48aa95834c
+DIST postfix-3.6.0-RC1.tar.gz 4748644 BLAKE2B 288064e6f1cb60060c960772ceab87cdc8b8dea23489f4ec0368074fe80d5aff0c2bb768e93d2a7a369c63a67590b92539a3c5f89c8088bc9372f199fe9136b7 SHA512 64837a83fc7df0210b02ceb18d4d5b562cc2f0219a3b1457986633d1ebb4c1790b3f288d48039fc85352d28a31b128557f975185f1e0a95623021aa4db8a2c30
+EBUILD postfix-3.5.10.ebuild 8867 BLAKE2B 5502caafc72e6cc477c2ec32ed39eca48d979ed09c9a797bfe2ac147385a1d636b9cadc1f9b920f17ecb0c8e43d5fca60e355e13af1d68fe20c6c5965af50262 SHA512 4330677f846f701056e408f08534709d48f3fa1a03844ee4e74e64e81064fa6c25d1416a00db3780313ed46ecd9f89dcf20d28a3b140bee932ae5c91e7ab9211
EBUILD postfix-3.5.8-r1.ebuild 8862 BLAKE2B c9712ef05b3e80c38d10f215c355e19f2b0a319034a04d10234733f50b68b161bec2789a56b553447a6932d1dfffab52a801f0ebc5b55410409f69ce1497a780 SHA512 5dce3db0ebb51b9b5e35ad5a425f2fdbfad6e439383831db7d78b740eccb9bd34ac0f7374c110cf03164e84afe745d93a1e9b3b1f34dc0c264e25cae348654a1
EBUILD postfix-3.5.9-r1.ebuild 8867 BLAKE2B 5502caafc72e6cc477c2ec32ed39eca48d979ed09c9a797bfe2ac147385a1d636b9cadc1f9b920f17ecb0c8e43d5fca60e355e13af1d68fe20c6c5965af50262 SHA512 4330677f846f701056e408f08534709d48f3fa1a03844ee4e74e64e81064fa6c25d1416a00db3780313ed46ecd9f89dcf20d28a3b140bee932ae5c91e7ab9211
-EBUILD postfix-3.6_pre20210224.ebuild 7987 BLAKE2B ff17c4b600d024cd51cf53a999b6949b7bfcad747d8ec06111f8556aed0bb44dee0220849b4858ddd423c01edf584274b0551b1866264c1c049e34509747ce06 SHA512 c1d0b46bd8efd0e10209fd6a728663f57711fc192db3ed4237f1d997f6a03e08291cc0e9fabee7cc5013b85b8533ecd7cb1822f03e86fa892b41b2dfd536263a
+EBUILD postfix-3.6.0_rc1.ebuild 7984 BLAKE2B 30ccb9c5339e0cf795b97e6228a5190d0bbce455d1a254b536fc684f767e82ed54d80f3291847ea0dc52f5c05d9c0e5e0309f5f4fad05bc8fa49de98c48c3e11 SHA512 5cefa9c8a1a6b83f0158e704f69fd2f6a9633c801e3051c5abe6fcff5c4213c514b93629c0f620823d0166c329126967b10fb51206e43b0cda03e0f145966634
+EBUILD postfix-3.6_pre20210422.ebuild 7987 BLAKE2B ff17c4b600d024cd51cf53a999b6949b7bfcad747d8ec06111f8556aed0bb44dee0220849b4858ddd423c01edf584274b0551b1866264c1c049e34509747ce06 SHA512 c1d0b46bd8efd0e10209fd6a728663f57711fc192db3ed4237f1d997f6a03e08291cc0e9fabee7cc5013b85b8533ecd7cb1822f03e86fa892b41b2dfd536263a
MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/postfix-3.5.10.ebuild b/mail-mta/postfix/postfix-3.5.10.ebuild
new file mode 100644
index 000000000000..100b89428484
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.5.10.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam systemd toolchain-funcs
+
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+ acct-group/postfix
+ acct-group/postdrop
+ acct-user/postfix
+ >=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? ( sys-libs/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-2.9.1:0= )
+ )"
+
+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[mta]
+ !net-mail/fastforward
+ selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-libressl-certkey.patch"
+ "${FILESDIR}/${PN}-libressl-server.patch"
+)
+
+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"
+}
+
+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 <robbat2@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
+
+ if use pam; then
+ pamd_mimic_system smtp auth account
+ fi
+
+ 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
+}
diff --git a/mail-mta/postfix/postfix-3.6.0_rc1.ebuild b/mail-mta/postfix/postfix-3.6.0_rc1.ebuild
new file mode 100644
index 000000000000..96598ffacec1
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.6.0_rc1.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit pam systemd toolchain-funcs
+
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+ acct-group/postfix
+ acct-group/postdrop
+ acct-user/postfix
+ >=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? ( sys-libs/pam )
+ postgres? ( dev-db/postgresql:* )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( >=dev-libs/openssl-1.1.1:0= )
+ "
+
+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[mta]
+ !net-mail/fastforward
+ selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+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"
+}
+
+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
+
+ 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 and tlstype
+ 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
+ dobin auxiliary/collate/tlstype.pl
+ dodoc auxiliary/collate/README.tlstype
+
+ # 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
+
+ if use pam; then
+ pamd_mimic_system smtp auth account
+ fi
+
+ 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.6_pre20210224.ebuild b/mail-mta/postfix/postfix-3.6_pre20210422.ebuild
index 3df0aef4df2f..3df0aef4df2f 100644
--- a/mail-mta/postfix/postfix-3.6_pre20210224.ebuild
+++ b/mail-mta/postfix/postfix-3.6_pre20210422.ebuild
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
deleted file mode 100644
index 4ac0f4b615be..000000000000
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST protonmail-bridge-1.4.5-1.x86_64.rpm 55357615 BLAKE2B f3ba298bdab26df9d7bebe65f974fde01962890c174dab91d6fb32f4349655bc8561009321f1b4906370bc9cd8a8946f094f215fb38a3aa0b6c8d633e2c44232 SHA512 80273ab2a679bedd6c6a2dc906545d15b4aee281303b255a749c5de15286ce8b49e6c3805ab594057d5c3af7dfedeb8b9acefab4be83e0f7728d06523d64143e
-DIST protonmail-bridge-1.5.0-1.x86_64.rpm 55971031 BLAKE2B 072a0fb93a669a22818c6c635ee2306a81ec814b546d8b5ffa3c1f8b3662a3e6c58f99bed5eca76ccdc99a4ee73f9a969afa63c5c3b43da72bb1b12c19218e96 SHA512 a17d68630781cd02589b9f3758d9d0c56641dae256a6edf496247fdb91524a508ece0ca553ae207bea119322a76fa2bc89aa2455cbea8dfc5c3f3182b3508670
-DIST protonmail-bridge-1.5.2-1.x86_64.rpm 55876213 BLAKE2B 28be6035954352b5d8d102a9edc730baaa50f2e1b9278f32fcf71e6c41250a1684f2d56615e648b9a8c8e55262c3f2c0098e21b86f4121a7d4592e7ec61f660a SHA512 3b3c3176765feed246d0e032a292d2f7acb7e4a41bac0e80514ca968ef2352a12837b52301f503d5fddef8436e81eedf4f1227431b89ac2660d2b02fbc64b295
-EBUILD protonmail-bridge-bin-1.4.5.ebuild 11824 BLAKE2B 8e4572586ac8531ab4f41ac3a3f27be2d23b7c67bdd3f4dbc6639adf4e15f7132b26008a7acfb787baa25f0851d47d85e758f9aa18af19054ef9f20323d2381f SHA512 60ca490cc98f2c46824a20ef91dc7b9455aca4319fb28550b533588d2969d93ff25500c9236b55404cfa1d6f1b23aaf344a6270bb726261fd8475e57b3e7ee7f
-EBUILD protonmail-bridge-bin-1.5.0.ebuild 11824 BLAKE2B 8e4572586ac8531ab4f41ac3a3f27be2d23b7c67bdd3f4dbc6639adf4e15f7132b26008a7acfb787baa25f0851d47d85e758f9aa18af19054ef9f20323d2381f SHA512 60ca490cc98f2c46824a20ef91dc7b9455aca4319fb28550b533588d2969d93ff25500c9236b55404cfa1d6f1b23aaf344a6270bb726261fd8475e57b3e7ee7f
-EBUILD protonmail-bridge-bin-1.5.2.ebuild 11824 BLAKE2B 8e4572586ac8531ab4f41ac3a3f27be2d23b7c67bdd3f4dbc6639adf4e15f7132b26008a7acfb787baa25f0851d47d85e758f9aa18af19054ef9f20323d2381f SHA512 60ca490cc98f2c46824a20ef91dc7b9455aca4319fb28550b533588d2969d93ff25500c9236b55404cfa1d6f1b23aaf344a6270bb726261fd8475e57b3e7ee7f
-MISC metadata.xml 613 BLAKE2B 5416b2d2d8163513d25a25be489a3c4b7be70066c8bedc75df9527617e1f3c57ec23d7ffd95755d355d07c37b043b80c1375c2424fc0ec3970fe9b9722e6c67c SHA512 182afd3b72bbd3b167b6240268644dda3bb09b057dfa8a2bc6d06a9c665ffae56297618635c71fab0fc18657da9add3e27d7e5920421b8352b7c5d1fedf642a7
diff --git a/mail-mta/protonmail-bridge-bin/metadata.xml b/mail-mta/protonmail-bridge-bin/metadata.xml
deleted file mode 100644
index 5ed086f2b4a3..000000000000
--- a/mail-mta/protonmail-bridge-bin/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>slashbeast@gentoo.org</email>
- <name>Piotr Karbowski</name>
- </maintainer>
- <maintainer type="person">
- <email>marecki@gentoo.org</email>
- <name>Marek Szuba</name>
- </maintainer>
- <maintainer type="person" proxied="yes">
- <email>lucianposton@pm.me</email>
- <name>Lucian Poston</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.4.5.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.4.5.ebuild
deleted file mode 100644
index e1fe63e09423..000000000000
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.4.5.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm xdg-utils
-
-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
- x11-libs/libxkbcommon[X]
-"
-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/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/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
- rm "lib/libQt5WaylandClient.so.5" || die
- rm "lib/libQt5WaylandCompositor.so.5" || die
- rm "plugins/canbus/libqtvirtualcanbus.so" || die
- rm "plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so" || die
- rm "plugins/platforms/libqwayland-egl.so" || die
- rm "plugins/platforms/libqwayland-generic.so" || die
- rm "plugins/platforms/libqwayland-xcomposite-egl.so" || die
- rm "plugins/platforms/libqwayland-xcomposite-glx.so" || die
- rm "plugins/platforms/libqwebgl.so" || die
- rm "plugins/position/libqtposition_geoclue2.so" || die
- rm "plugins/sqldrivers/libqsqlodbc.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_hangul.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_openwnn.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so" || die
- rm "plugins/wayland-decoration-client/libbradient.so" || die
- rm "plugins/wayland-graphics-integration-client/libdmabuf-server.so" || die
- rm "plugins/wayland-graphics-integration-client/libdrm-egl-server.so" || die
- rm "plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so" || die
- rm "plugins/wayland-graphics-integration-client/libshm-emulation-server.so" || die
- rm "plugins/wayland-graphics-integration-client/libxcomposite-egl.so" || die
- rm "plugins/wayland-graphics-integration-client/libxcomposite-glx.so" || die
- rm "plugins/wayland-graphics-integration-server/libdmabuf-server.so" || die
- rm "plugins/wayland-graphics-integration-server/libdrm-egl-server.so" || die
- rm "plugins/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so" || die
- rm "plugins/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so" || die
- rm "plugins/wayland-graphics-integration-server/libshm-emulation-server.so" || die
- rm "plugins/wayland-graphics-integration-server/libwayland-eglstream-controller.so" || die
- rm "plugins/wayland-graphics-integration-server/libxcomposite-egl.so" || die
- rm "plugins/wayland-graphics-integration-server/libxcomposite-glx.so" || die
- rm "plugins/wayland-shell-integration/libfullscreen-shell-v1.so" || die
- rm "plugins/wayland-shell-integration/libivi-shell.so" || die
- rm "plugins/wayland-shell-integration/libwl-shell.so" || die
- rm "plugins/wayland-shell-integration/libxdg-shell-v5.so" || die
- rm "plugins/wayland-shell-integration/libxdg-shell-v6.so" || die
- rm "plugins/wayland-shell-integration/libxdg-shell.so" || die
- rm "qml/QtCharts/libqtchartsqml2.so" || die
- rm "qml/QtDataVisualization/libdatavisualizationqml2.so" || die
- rm "qml/QtPurchasing/libdeclarative_purchasing.so" || die
- rm "qml/QtQuick/VirtualKeyboard/Settings/libqtquickvirtualkeyboardsettingsplugin.so" || die
- rm "qml/QtQuick/VirtualKeyboard/Styles/libqtquickvirtualkeyboardstylesplugin.so" || die
- rm "qml/QtQuick/VirtualKeyboard/libqtquickvirtualkeyboardplugin.so" || die
- rm "qml/QtRemoteObjects/libqtremoteobjects.so" || die
- rm "qml/QtWayland/Compositor/libqwaylandcompositorplugin.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
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.5.0.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.5.0.ebuild
deleted file mode 100644
index e1fe63e09423..000000000000
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.5.0.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm xdg-utils
-
-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
- x11-libs/libxkbcommon[X]
-"
-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/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/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
- rm "lib/libQt5WaylandClient.so.5" || die
- rm "lib/libQt5WaylandCompositor.so.5" || die
- rm "plugins/canbus/libqtvirtualcanbus.so" || die
- rm "plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so" || die
- rm "plugins/platforms/libqwayland-egl.so" || die
- rm "plugins/platforms/libqwayland-generic.so" || die
- rm "plugins/platforms/libqwayland-xcomposite-egl.so" || die
- rm "plugins/platforms/libqwayland-xcomposite-glx.so" || die
- rm "plugins/platforms/libqwebgl.so" || die
- rm "plugins/position/libqtposition_geoclue2.so" || die
- rm "plugins/sqldrivers/libqsqlodbc.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_hangul.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_openwnn.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so" || die
- rm "plugins/wayland-decoration-client/libbradient.so" || die
- rm "plugins/wayland-graphics-integration-client/libdmabuf-server.so" || die
- rm "plugins/wayland-graphics-integration-client/libdrm-egl-server.so" || die
- rm "plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so" || die
- rm "plugins/wayland-graphics-integration-client/libshm-emulation-server.so" || die
- rm "plugins/wayland-graphics-integration-client/libxcomposite-egl.so" || die
- rm "plugins/wayland-graphics-integration-client/libxcomposite-glx.so" || die
- rm "plugins/wayland-graphics-integration-server/libdmabuf-server.so" || die
- rm "plugins/wayland-graphics-integration-server/libdrm-egl-server.so" || die
- rm "plugins/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so" || die
- rm "plugins/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so" || die
- rm "plugins/wayland-graphics-integration-server/libshm-emulation-server.so" || die
- rm "plugins/wayland-graphics-integration-server/libwayland-eglstream-controller.so" || die
- rm "plugins/wayland-graphics-integration-server/libxcomposite-egl.so" || die
- rm "plugins/wayland-graphics-integration-server/libxcomposite-glx.so" || die
- rm "plugins/wayland-shell-integration/libfullscreen-shell-v1.so" || die
- rm "plugins/wayland-shell-integration/libivi-shell.so" || die
- rm "plugins/wayland-shell-integration/libwl-shell.so" || die
- rm "plugins/wayland-shell-integration/libxdg-shell-v5.so" || die
- rm "plugins/wayland-shell-integration/libxdg-shell-v6.so" || die
- rm "plugins/wayland-shell-integration/libxdg-shell.so" || die
- rm "qml/QtCharts/libqtchartsqml2.so" || die
- rm "qml/QtDataVisualization/libdatavisualizationqml2.so" || die
- rm "qml/QtPurchasing/libdeclarative_purchasing.so" || die
- rm "qml/QtQuick/VirtualKeyboard/Settings/libqtquickvirtualkeyboardsettingsplugin.so" || die
- rm "qml/QtQuick/VirtualKeyboard/Styles/libqtquickvirtualkeyboardstylesplugin.so" || die
- rm "qml/QtQuick/VirtualKeyboard/libqtquickvirtualkeyboardplugin.so" || die
- rm "qml/QtRemoteObjects/libqtremoteobjects.so" || die
- rm "qml/QtWayland/Compositor/libqwaylandcompositorplugin.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
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.5.2.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.5.2.ebuild
deleted file mode 100644
index e1fe63e09423..000000000000
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.5.2.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm xdg-utils
-
-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
- x11-libs/libxkbcommon[X]
-"
-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/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/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
- rm "lib/libQt5WaylandClient.so.5" || die
- rm "lib/libQt5WaylandCompositor.so.5" || die
- rm "plugins/canbus/libqtvirtualcanbus.so" || die
- rm "plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so" || die
- rm "plugins/platforms/libqwayland-egl.so" || die
- rm "plugins/platforms/libqwayland-generic.so" || die
- rm "plugins/platforms/libqwayland-xcomposite-egl.so" || die
- rm "plugins/platforms/libqwayland-xcomposite-glx.so" || die
- rm "plugins/platforms/libqwebgl.so" || die
- rm "plugins/position/libqtposition_geoclue2.so" || die
- rm "plugins/sqldrivers/libqsqlodbc.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_hangul.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_openwnn.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so" || die
- rm "plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so" || die
- rm "plugins/wayland-decoration-client/libbradient.so" || die
- rm "plugins/wayland-graphics-integration-client/libdmabuf-server.so" || die
- rm "plugins/wayland-graphics-integration-client/libdrm-egl-server.so" || die
- rm "plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so" || die
- rm "plugins/wayland-graphics-integration-client/libshm-emulation-server.so" || die
- rm "plugins/wayland-graphics-integration-client/libxcomposite-egl.so" || die
- rm "plugins/wayland-graphics-integration-client/libxcomposite-glx.so" || die
- rm "plugins/wayland-graphics-integration-server/libdmabuf-server.so" || die
- rm "plugins/wayland-graphics-integration-server/libdrm-egl-server.so" || die
- rm "plugins/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so" || die
- rm "plugins/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so" || die
- rm "plugins/wayland-graphics-integration-server/libshm-emulation-server.so" || die
- rm "plugins/wayland-graphics-integration-server/libwayland-eglstream-controller.so" || die
- rm "plugins/wayland-graphics-integration-server/libxcomposite-egl.so" || die
- rm "plugins/wayland-graphics-integration-server/libxcomposite-glx.so" || die
- rm "plugins/wayland-shell-integration/libfullscreen-shell-v1.so" || die
- rm "plugins/wayland-shell-integration/libivi-shell.so" || die
- rm "plugins/wayland-shell-integration/libwl-shell.so" || die
- rm "plugins/wayland-shell-integration/libxdg-shell-v5.so" || die
- rm "plugins/wayland-shell-integration/libxdg-shell-v6.so" || die
- rm "plugins/wayland-shell-integration/libxdg-shell.so" || die
- rm "qml/QtCharts/libqtchartsqml2.so" || die
- rm "qml/QtDataVisualization/libdatavisualizationqml2.so" || die
- rm "qml/QtPurchasing/libdeclarative_purchasing.so" || die
- rm "qml/QtQuick/VirtualKeyboard/Settings/libqtquickvirtualkeyboardsettingsplugin.so" || die
- rm "qml/QtQuick/VirtualKeyboard/Styles/libqtquickvirtualkeyboardstylesplugin.so" || die
- rm "qml/QtQuick/VirtualKeyboard/libqtquickvirtualkeyboardplugin.so" || die
- rm "qml/QtRemoteObjects/libqtremoteobjects.so" || die
- rm "qml/QtWayland/Compositor/libqwaylandcompositorplugin.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
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/mail-mta/protonmail-bridge/Manifest b/mail-mta/protonmail-bridge/Manifest
index 2c078d8079ba..7871f0f623d8 100644
--- a/mail-mta/protonmail-bridge/Manifest
+++ b/mail-mta/protonmail-bridge/Manifest
@@ -78,8 +78,6 @@ DIST github.com%2Femersion%2Fgo-imap-idle%2F@v%2Fv0.0.0-20200601154248-f05f54664
DIST github.com%2Femersion%2Fgo-imap-idle%2F@v%2Fv0.0.0-20200601154248-f05f54664cc4.zip 6392 BLAKE2B 369446455bfec51e81db08238a6a0f3e01b633ca0000f72b8aa2851cb68e845bdacf63270f9cbb137ad5efe8633250b76a35b097593dee0f1af10f96266fc009 SHA512 92cc5009d279a5ed6a04f38badb1bc3adbeb5279d7e1d7844e67bc3fccaf1b23911fa147d382e40e700a819285f117f7518df535eb51deda2bb366b9e69e6f23
DIST github.com%2Femersion%2Fgo-imap-move%2F@v%2Fv0.0.0-20190710073258-6e5a51a5b342.mod 40 BLAKE2B 6d885135d81932507052375b8070da9a0b25f29792087b90f4542f5b3978aa1f478a8cf3722bb29ded7d4e3b8af65b9d55024fd9b50df151b89584120ba71b4e SHA512 7fc8ba40d0d2255200c49d159bdc1a4b724dc98eb5f26767d2479a6c0d27d81ac9729d3acd15393d83012ef6e81ae848125aee28a19f27b474631f3528d0819c
DIST github.com%2Femersion%2Fgo-imap-move%2F@v%2Fv0.0.0-20190710073258-6e5a51a5b342.zip 4879 BLAKE2B 8f89d359457e74b1de159c0c25f5f1cbc31375086786e67ba04de77dbddd88d3c409e0260f61d9232b406f99b48a795aaf66c2b47a496e6d4f092036c9b3fa9a SHA512 0e2391c42450c9036b5a66822a32a154726b6735d15f531770223c9230b1122eb416c6953f6da288321e085fdac833aa6525da362ef5024ed92119aa6f839450
-DIST github.com%2Femersion%2Fgo-imap-quota%2F@v%2Fv0.0.0-20200423100218-dcfd1b7d2b41.mod 41 BLAKE2B 6a8ffeb78340cf03ffb87dc3bcd1bbea4d848ce95603e856f3d895681382977e8464766c9b8000a52b757f0a3399c6042eb0e26e2c1a3d0c0cd906562242b47f SHA512 e431cfc3256de1b0d9683cca7422a22ef831cb12a4048d3d3adb45331270a20b2454908087c9535c64dcd8c6f75fd63f20590af259d1052c68016fc87c86aff5
-DIST github.com%2Femersion%2Fgo-imap-quota%2F@v%2Fv0.0.0-20200423100218-dcfd1b7d2b41.zip 6988 BLAKE2B 27b638f15ae22ace24f2ba6ce617a89bcccc6a91755d787fbee0545310fc8139390857e964b07772d86945b5aed3005484eecaeb375bae4e8e0d90e717d53227 SHA512 965bccfdc470ee02d4b6f2f0200eb48b340b34a78cef82e2f93081fecf47997556cd39f8a144f09a49320b198c8a4957dd7687459c3ce41eff058178f7d4d4b3
DIST github.com%2Femersion%2Fgo-imap-quota%2F@v%2Fv0.0.0-20210203125329-619074823f3c.mod 41 BLAKE2B 6a8ffeb78340cf03ffb87dc3bcd1bbea4d848ce95603e856f3d895681382977e8464766c9b8000a52b757f0a3399c6042eb0e26e2c1a3d0c0cd906562242b47f SHA512 e431cfc3256de1b0d9683cca7422a22ef831cb12a4048d3d3adb45331270a20b2454908087c9535c64dcd8c6f75fd63f20590af259d1052c68016fc87c86aff5
DIST github.com%2Femersion%2Fgo-imap-quota%2F@v%2Fv0.0.0-20210203125329-619074823f3c.zip 6994 BLAKE2B 991f973e37f864759fbbeb633b4810a83be3a97589363b8ab9b24b39d2647600ce5030d1c7850456a86868dd5a46204cb559ec5927be3d6a4ab31d096279a45e SHA512 2d1fcb21fbed8de34e38930823aecb975e9f23d4984e283c04a010aa29e5bb310a14c5780db209cbeb7a0b898e0ea0375c2497baf264ae9d11aeafb20289b259
DIST github.com%2Femersion%2Fgo-imap-unselect%2F@v%2Fv0.0.0-20171113212723-b985794e5f26.mod 44 BLAKE2B ad97f48981b24805164ad750f1e0742942dcb40fcc18f4e4ee889232f5afe15e14886c1908174146cdb46148e7b40fb1f978a5afebac81c4c8b790fb62d576a0 SHA512 f2ba8441d9a51e08d25d949691a0544897ec44c7c4a87224b1f4605ffb552a681e3030326b9accf26893c512146e844a270a15ae7ff763b067e8c1a6d5837122
@@ -267,6 +265,12 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
DIST github.com%2Ftherecipe%2Fqt%2F@v%2Fv0.0.0-20200701200531-7f61353ee73e.mod 981 BLAKE2B 34b7805e7762a3a353118c4fe0902f895a3281baf0aec98de9ccb2572c272012e9087a7068a5a4880d4ec94d688b8a001faed0c1e250bd82e29ad52836102f66 SHA512 f1a73209ccee5122864ac345de9712b95bce2852dfbb45075b7371482f6d26939b87fdb0c5202590f9a22e594f199f085b3427d1472c4301a8e214b8ef600d53
DIST github.com%2Ftherecipe%2Fqt%2F@v%2Fv0.0.0-20200701200531-7f61353ee73e.zip 5439966 BLAKE2B d82dfabc65708dfa74af5fc2b173d5c5f1bf2fb5307ec15a1830ab3a1e309dce797d6cbd0e68352e7fb4e9218c5c5d912bf135330e4219c884a3f9138242bb03 SHA512 f22c87b7cb50c0b308c42a7aaac7b18ef646e783c1e90a99efc0f701db290ba5da9ee794d98d1104053ee93cea9d4bba0b844a3c9f90b3361f9fd1b84f990c98
+DIST github.com%2Ftherecipe%2Fqt%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip 3082277 BLAKE2B 395d71a1af4752e043cad6e6e9991f939e188741a3b9312574313ef9092b4bf1fb8927a21784bd794feda1c54fd5eef8a789f1d9a23d5258ba2e8f92c7827e6c SHA512 9604cd88161289e8f3e0f42d97de607a3b38fe205aaec564374697cfef19f8f458de7925d427735bc9a7dc278f9b70d7a23cd837fd11020de2b00e457a0553d9
+DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.12.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.mod 66 BLAKE2B 143bef9f2ad0de822e8f6ebb8db6c5a50cd0e29b029321e54f51e12459440e8032e1d0ce02f7f5e4ae1e79bbdd9a3c32435c5989b1de3c5691d115451b6d3392 SHA512 7b4bc3cae0c8c436cb2e75696c4928c610e52cd34cd58b66bf217300066ea2ad42948b762d5ee91a9a94049f08e09f7794c263d745ae8e49542b659f90b9ebf8
+DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.12.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip 7699921 BLAKE2B f318b2a9ae8e4f4065aa66afb2ffaa2fbd4a5364c1d1b095c6dca38881d007399d3a55127498c1a6d47ea2176c5822abffd42d9d4074c05b1004b1b39066e688 SHA512 f6980bb5981696058766d67a6ffbb8d6e600ba468e48b98132a9be9628ae432fbc4bc341283c99e8535efeaa8baf9fe1e6621647e23dcc8c43d0e16711cd0099
+DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.13.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.mod 66 BLAKE2B 3c0df58b5c2aa6eb4f2c943cc0033f853f4d4d63e4d405cf05ee52d8f690c4f0e2068ea96e17956be286c956e61e0ae30f3c6262a458f5a4fa8d1c5bb0328430 SHA512 0654069c54acbc55a2c4014548742fd9be1b2846bc98ac7f44c9feef61ea58e80a813b891c2b7ce0ed48b068f4ae24a8370c92fbbeaa187c13717bd78f4c5b97
+DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.13.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip 8155800 BLAKE2B 7d7b2522bfba1171cb0d99b7720f68a4f645149f80cfcabfaf068ae4071eafe6d03de2a099e6c027ce02e02222649ca8b9b7dbd03227b677aeb80a535af77d8e SHA512 38f0fd555b09d5bab48191432dd6dcbdea5c171870500a89b1f43a2554e9f5c15af4e7a3c20a369d7b1d82fa2b1669f40676b5f04a0ea6878133b863f8f19f8f
+DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F@v%2Fv0.0.0-20191019224306-1097424d656c.zip 3609 BLAKE2B 30643301e6c943df029735c8f4b0103b868750a729c36fa4ba2029a010fcb3e8d408382022139e5f85ecb5a3ba195c660364e7540e243a6f2283ca6e6b8b1359 SHA512 5490f417aa17a94d699d1a90208942b5446c2daca31c29704957c95265e2fd38b53dda5a1e8d62a9d19642b9bf46ead0c22b8d0cd56ec283ebac97a3274a6314
DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.7.mod 75 BLAKE2B 0326456cbc5968cbc6068bf4dcf61ff05d0cb193d96f238ea7ee34c7457a70c0aef4029ad33512deee60ae07740777662a5613e222304a00d942d06a9321d1de SHA512 d1dbd3c550a62822be4a6e018e2d1598dd7993db76c2c5d0ec958a0d83fb73c1d9803ef3d5e298a5b7e7cc8fb2359013703e6dfe2ef85cf280035e414f78bf69
DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
@@ -370,8 +374,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20191120175047-4206685974f2.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
-DIST protonmail-bridge-1.6.3.tar.gz 1868157 BLAKE2B a1dd7d1e4ca740dc3a03d8f397b442e33fadb5ac629f585e697c5764fa20b94fc5c07f27573ee1a3e5836082cedcb777af765c887cb8889ccce5866f7a688c4c SHA512 c959822ef4acb816f74783186e2d2ae3b094852c1a969488875e3077bee0c11dfc1509e688afa6897568165870ec5a5aa204f47176373aa7e004d68add7a2110
DIST protonmail-bridge-1.6.6.tar.gz 1871189 BLAKE2B e6effe40fa5828c08a5f5c2fbf848295f4f88ec5057af915b28fae57be51a67aa35c6530f270709ecef4aa17a781b5a97c358191b1da186b0f03f3a64b62b1a2 SHA512 40f0bd52f839ff220ad28a49404915983356f12bfefea5ccb1c68cde20b954da31c0db1535fb5379385c5109ff2f5ab8cda0d93bc618f8e786d0e4c4c078506d
-EBUILD protonmail-bridge-1.6.3.ebuild 21974 BLAKE2B 7933bd875412510e384eacdf401da16e72db763b9ef47613bd69bb0422e2717ebb26a88818d99bd0c404cc6ab30eff6e5379bf5ac1a8354efd4e8dc905e9a25c SHA512 2e0fb0f93aeeb6c98b2883ff93ea77e928d9e5e486fae6d0bc31252d0fa446267907b696f45e21ce9089e19594420994a2920a882c7f0fd1b5cea1ce17e7d6d8
+DIST protonmail-bridge-1.6.9.tar.gz 1877045 BLAKE2B 18aaec6528ff5d78c48f426e2d2ca57f45c374fcae6019b0410c66ad85726ac151cceb9f3cd3bed10a5709de7e3eeb4a0ad559a8e28e33940cdb94e089cf834f SHA512 64928010eedac3434e5c17e7d38074807e81e877c3f675928835613e7955de0e3a0495861b933478a1d81e37020c1fc600a5495e2f1fd319d0c15de8d3125ebe
EBUILD protonmail-bridge-1.6.6.ebuild 22097 BLAKE2B db7a551e16df0f1400d18ed937edc6fd39093265a84e105ed3757804de86435a7c357b499e13513321e8f935190dcffc9c4d1b1354ba54fd30fa7c6385f6780c SHA512 8d156e2c2918ac3773a15efd9aae9db734757803e8535e9a660cd09c25aa1e016294f364ee952e9b032d59062a08b990308eb97ce94992edffd946b54045872e
+EBUILD protonmail-bridge-1.6.9.ebuild 22373 BLAKE2B 865557533b2ca99b4ade65c4a5aef540b3ccfc2d5dcfafa1297e2f98ab0ae0a87e7456e4646bd28f4d1b3bcd60fb909f2268f1cfd64de12ef44ffed85c63d791 SHA512 f5b54f38876283f325699ea6274eba7b01a8deb6bb656ec4cf93c1756c0d95441724bc277d5242bc16fad237e36e498138c7c143e55aab58b9d281eeb35dbefc
MISC metadata.xml 618 BLAKE2B a392fa79076ac6eed79581e425edc46eeaa42e4ff3193fe23845062f4de9e8e9edc067473724707ce07025973f0942bdebc94b10c7f02f1e477835ce969ab556 SHA512 813f43dcdec361b1fd0f354245e7572ef2061500bea09fcf2712c1d44883cfadbd0c37dcf960d5dc34c848530a3dd80abaeb6b5da26fbb81363116ec737a1c84
diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-1.6.3.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-1.6.9.ebuild
index 0e3dcd9a13fd..59127288a9fb 100644
--- a/mail-mta/protonmail-bridge/protonmail-bridge-1.6.3.ebuild
+++ b/mail-mta/protonmail-bridge/protonmail-bridge-1.6.9.ebuild
@@ -85,8 +85,8 @@ EGO_SUM=(
"github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4/go.mod"
"github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342"
"github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342/go.mod"
- "github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41"
- "github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41/go.mod"
+ "github.com/emersion/go-imap-quota v0.0.0-20210203125329-619074823f3c"
+ "github.com/emersion/go-imap-quota v0.0.0-20210203125329-619074823f3c/go.mod"
"github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26"
"github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26/go.mod"
"github.com/emersion/go-mbox v1.0.2"
@@ -270,6 +270,12 @@ EGO_SUM=(
"github.com/stretchr/testify v1.6.1/go.mod"
"github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e"
"github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e/go.mod"
+ "github.com/therecipe/qt v0.0.0-20200904063919-c0c124a5770d"
+ "github.com/therecipe/qt/internal/binding/files/docs v0.0.0-20191019224306-1097424d656c"
+ "github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d"
+ "github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d/go.mod"
+ "github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d"
+ "github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d/go.mod"
"github.com/ugorji/go v1.1.4/go.mod"
"github.com/ugorji/go v1.1.7/go.mod"
"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
@@ -393,8 +399,7 @@ IUSE="gui"
# Some of the tests fail without access to a keyring service
RESTRICT="test"
-RDEPEND="app-crypt/libsecret
- gui? ( !mail-mta/protonmail-bridge-bin )" # /usr/bin file collision
+RDEPEND="app-crypt/libsecret"
DEPEND="${RDEPEND}"
S="${WORKDIR}"/${MY_P}
@@ -420,22 +425,10 @@ src_test() {
}
src_install() {
- # A slight hack to allow this package (which is currently limited to CLI mode)
- # and protonmail-bridge-bin (which supports GUI mode) to co-exist.
- local bin_name unit_name
- if use gui; then
- bin_name="${PN}"
- unit_name="${FILESDIR}/${PN}.service"
- else
- bin_name="${PN}-cli"
- unit_name="${PN}-cli.service"
- sed -e "s|${PN}|${bin_name}|" "${FILESDIR}"/${PN}.service > ${unit_name} || die
- fi
-
exeinto /usr/bin
- newexe proton-bridge ${bin_name}
+ newexe proton-bridge ${PN}
- systemd_douserunit ${unit_name}
+ systemd_douserunit "${FILESDIR}"/${PN}.service
# FIXME: USE=gui will probably need more files
@@ -444,6 +437,11 @@ src_install() {
pkg_postinst() {
use gui && xdg_icon_cache_update
+
+ # Don't bother checking for USE=-gui here, it has never worked yet
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ ewarn "Please note that following the removal of ${CATEGORY}/${PN}-bin, the executable and the systemd unit file installed by ${PN} are now called simply '${PN}' rather than '${PN}-cli'"
+ fi
}
pkg_postrm() {
diff --git a/mail-mta/qpsmtpd/Manifest b/mail-mta/qpsmtpd/Manifest
index 61a546c271db..f37fc8717baa 100644
--- a/mail-mta/qpsmtpd/Manifest
+++ b/mail-mta/qpsmtpd/Manifest
@@ -4,6 +4,6 @@ AUX qpsmtpd.initd 2058 BLAKE2B fb059ade05f13bd85d5b8850fd24e469d035e56bab50d3159
AUX qpsmtpd.initd-r1 2054 BLAKE2B 4e8ecb536017aa8995ed16e460b699ac0c7c4b4263bbde386662a498854cd39a9b57144b9b0804388f9a8db3971b6ceaaae2525a8caed6e8f30026d00cd98c09 SHA512 5c62c18b249fe0566b958f1a43f4d31f376005ec393d493fd419b89f0a08a23a41d6b8b24c30d4e5cb7b672a545ebeafc9b5645e3b1e2aa8c7bfcfaca20f07ff
AUX qpsmtpd.xinetd 526 BLAKE2B 1adea2cc681c9902e1c99479ac8d8d2a750de7241273e0fa42b5bd23ddb30b2ad9e4bf4ae70d798507a9ab5437d85bd39216d8a1ffe912a3fe5f33ff4576cfd0 SHA512 b02331ea352573ea6bb1a46b1df343d2819ebe39dc4a42ec750c9a59f49a653f01bc933d7a2ee32e86fd386395137309de8202970465a2a2d8668fa35ae03994
DIST qpsmtpd-0.95.tar.gz 367400 BLAKE2B bd77d8f203f1adf5ad6671fcd958bd97c5321317b51ceb9b9320cd2bc2fb82687b0d367618ad74905b3c4d44f0e83291d6330abbf4f8d01cd1d29ba7588f2df5 SHA512 4265606ecde68eda92091e2c3c27645baa131db4197f3d135932dc2ad8d76c1fb6c25ce267ab421cab3a4a9902aa682e4be87a1228e41b226705a64e440ffe87
-EBUILD qpsmtpd-0.95.ebuild 2183 BLAKE2B 75ba108638e297b55295f4216b42110b95c140fbc5e5ff7dff812cf239ddb2f6e70b0c3055b9a51a309dc7f3c8098b16892a6d1164368e34430b2e162b59dbee SHA512 b5108cdd04feb4561b87b03327b72387689bebebcb509d9d3ab611dc43a349b3a64c00714aeada3ac63fe21033f681b6622c206b5c7ab6b8a86db36acb2a1647
-EBUILD qpsmtpd-9999.ebuild 2183 BLAKE2B 75ba108638e297b55295f4216b42110b95c140fbc5e5ff7dff812cf239ddb2f6e70b0c3055b9a51a309dc7f3c8098b16892a6d1164368e34430b2e162b59dbee SHA512 b5108cdd04feb4561b87b03327b72387689bebebcb509d9d3ab611dc43a349b3a64c00714aeada3ac63fe21033f681b6622c206b5c7ab6b8a86db36acb2a1647
+EBUILD qpsmtpd-0.95-r1.ebuild 2028 BLAKE2B cb2e90ac9fe423c265d0f7ff69ad3d43882bc42c1f775b98d324d214c44d1bf861c96ca1c44f2d0db39b3b9707386a8402add58c2cc5e6f40ccc46cfff77128d SHA512 1e7e9d1ab0c42a3f7eb3a1dc560f2f4a7411cad6119f35fb3e38d8a315af382cadcebd4f535a5db381a130a42db9129ee111036eee80fb4f09992407011f58b6
+EBUILD qpsmtpd-9999.ebuild 2028 BLAKE2B cb2e90ac9fe423c265d0f7ff69ad3d43882bc42c1f775b98d324d214c44d1bf861c96ca1c44f2d0db39b3b9707386a8402add58c2cc5e6f40ccc46cfff77128d SHA512 1e7e9d1ab0c42a3f7eb3a1dc560f2f4a7411cad6119f35fb3e38d8a315af382cadcebd4f535a5db381a130a42db9129ee111036eee80fb4f09992407011f58b6
MISC metadata.xml 377 BLAKE2B 8bbb87961e42890dfbe28cfcaf4dec032314a0eaefbcabc063706606ef8cedbf95cad32958f2789da6aeee564c7fa0d690ef15f491cd8cd220d03ec5943140e0 SHA512 14a288d1baefa7a16d7977bb91c341a7a70b6f29c3617e2fb3b24bbe5f6c378b428664138ee630cf6d94a0613a687d385adacc4e73f6c1531c82c9e63d0db95b
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.95-r1.ebuild
index 2964681181e3..334237eed909 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.95-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit perl-module user ${SCM}
+inherit perl-module ${SCM}
DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
HOMEPAGE="https://smtpd.github.io/qpsmtpd/"
@@ -20,27 +20,23 @@ LICENSE="MIT"
SLOT="0"
IUSE="postfix ipv6 syslog"
-RDEPEND=">=dev-lang/perl-5.8.0
- >=dev-perl/Net-DNS-0.690.0
- virtual/perl-MIME-Base64
- dev-perl/MailTools
- dev-perl/IPC-Shareable
- dev-perl/Socket6
+RDEPEND="
+ acct-group/smtpd
+ acct-user/smtpd
+ dev-lang/perl
dev-perl/Danga-Socket
+ dev-perl/IPC-Shareable
+ dev-perl/MailTools
+ dev-perl/Net-DNS
dev-perl/ParaDNS
+ dev-perl/Socket6
dev-perl/UNIVERSAL-isa
+ postfix? ( acct-group/postdrop )
+ virtual/inetd
+ virtual/perl-MIME-Base64
ipv6? ( dev-perl/IO-Socket-INET6 )
syslog? ( virtual/perl-Sys-Syslog )
- virtual/inetd"
-
-pkg_setup() {
- enewgroup smtpd
- local additional_groups
- if use postfix; then
- additional_groups="${additional_groups},postdrop"
- fi
- enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
-}
+"
src_unpack() {
if [[ ${PV} != *9999 ]]; then
diff --git a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
index 2964681181e3..334237eed909 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=7
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit perl-module user ${SCM}
+inherit perl-module ${SCM}
DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
HOMEPAGE="https://smtpd.github.io/qpsmtpd/"
@@ -20,27 +20,23 @@ LICENSE="MIT"
SLOT="0"
IUSE="postfix ipv6 syslog"
-RDEPEND=">=dev-lang/perl-5.8.0
- >=dev-perl/Net-DNS-0.690.0
- virtual/perl-MIME-Base64
- dev-perl/MailTools
- dev-perl/IPC-Shareable
- dev-perl/Socket6
+RDEPEND="
+ acct-group/smtpd
+ acct-user/smtpd
+ dev-lang/perl
dev-perl/Danga-Socket
+ dev-perl/IPC-Shareable
+ dev-perl/MailTools
+ dev-perl/Net-DNS
dev-perl/ParaDNS
+ dev-perl/Socket6
dev-perl/UNIVERSAL-isa
+ postfix? ( acct-group/postdrop )
+ virtual/inetd
+ virtual/perl-MIME-Base64
ipv6? ( dev-perl/IO-Socket-INET6 )
syslog? ( virtual/perl-Sys-Syslog )
- virtual/inetd"
-
-pkg_setup() {
- enewgroup smtpd
- local additional_groups
- if use postfix; then
- additional_groups="${additional_groups},postdrop"
- fi
- enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
-}
+"
src_unpack() {
if [[ ${PV} != *9999 ]]; then
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index ae36976a6821..9a1e5ffbe935 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -1,4 +1,4 @@
DIST ssmtp-2.64-patches-4.tar.xz 6928 BLAKE2B 6f1d9a823273298abc58025c94cb288e1e296031580f63ed489a9d2559cd8846761e78c6fdfc1a385e645f990bc739ce3cf3ad0d1c1a3006dd3bd60e4a38c4f4 SHA512 6fa57c0bc5ad363e21bf69fb60f1cbb87ad1ead393a53ab5bd25b709303c321a29ed37ce7fe95b94dae748703bba3b0631fc2a95e40957c5241b5d9f42bc0c4a
DIST ssmtp_2.64.orig.tar.bz2 52501 BLAKE2B be158f8d969f98e1a7105bf4b741da960efa2a1c4a941426d6b6ec0677df13a2272fc71a93d2c44fe65c7d0a30e9acc4ec8259ed298b746c8d9ceefd64f95336 SHA512 911752e744420adf58552b9cf3a6e558d8b39103e5ad33a9ed4429b9a3a2091f7674aac11fe9bbd66747a61cdabe6bd638b80efcaadc86b057c12e2e235cca72
-EBUILD ssmtp-2.64-r3.ebuild 2995 BLAKE2B 9bba711820aac1fd40a35385f2f16fcd7127bbf6a59abfab210101c4b18e5a3b2525c4d740c6f717665c873acdb1c19a6660f4e149e733854f941492e47d3edc SHA512 3f9c224ae3ca73677b85a769bbf2e1071595b4eda203e8053a873361c8a1db45faddfd1591abae7b2a35779c2902078622b7002b7e471f1ed1c4b088be6ed1f2
+EBUILD ssmtp-2.64-r4.ebuild 3606 BLAKE2B 05c8a9c4a3bba94ae313d8fe3054a52af3169ed6c79fdb37c76cf89ae01be171d9f0b5f59b0e81b29309ab42e3674ba95db787a70bbada4b1f96cd65faf32d99 SHA512 ea7535e360713ce49ed0ee761c1f4328cd14d72cfc8e5973154e34318a4e91922fa9b4cbd4267f82ff73f7246c532046cd99ee0f4275786052b3f4433a886312
MISC metadata.xml 259 BLAKE2B eb59516b105b0fdc4b755c3852b714707dba4f5b414eb0eea763db68aa0c5d1971b55866972ef14f1e3e5bc81ccb66975a24b9292aa796edf02877d649a661f2 SHA512 3e7a5afefe4f2095be4347e56af64eef343bbb4920ef80a7d93c88111864e8993f899328af33e736324960d26f30939e29e001e90381548a353ee0089f96a766
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r4.ebuild
index 7a6224993762..321bf549dfd8 100644
--- a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64-r4.ebuild
@@ -1,61 +1,71 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
PATCHSET=4
-
WANT_AUTOMAKE=none
-inherit eutils autotools user
+inherit autotools
DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/"
-SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2
- https://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-patches-${PATCHSET}.tar.xz"
+SRC_URI="
+ mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2
+ https://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-patches-${PATCHSET}.tar.xz
+"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6 libressl +ssl gnutls +mta"
-DEPEND="ssl? (
+DEPEND="
+ !prefix? ( acct-group/ssmtp )
+ ssl? (
gnutls? ( net-libs/gnutls[openssl] )
!gnutls? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
- )"
-RDEPEND="${DEPEND}
+ )
+"
+RDEPEND="
+ ${DEPEND}
net-mail/mailbase
mta? (
- !net-mail/mailwrapper
!mail-mta/courier
!mail-mta/esmtp
!mail-mta/exim
!mail-mta/mini-qmail
!mail-mta/msmtp[mta]
- !mail-mta/nbsmtp
!mail-mta/netqmail
!mail-mta/nullmailer
!mail-mta/postfix
!mail-mta/qmail-ldap
!mail-mta/sendmail
!mail-mta/opensmtpd
- )"
+ )
+"
REQUIRED_USE="gnutls? ( ssl )"
-pkg_setup() {
- if ! use prefix; then
- enewgroup ssmtp
- fi
-}
-
src_prepare() {
- EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/patches" \
- epatch
- epatch_user
+ default
+
+ eapply "${WORKDIR}"/patches/0010_all_maxsysuid.patch
+ eapply "${WORKDIR}"/patches/0020_all_from-format-fix.patch
+ eapply "${WORKDIR}"/patches/0030_all_authpass.patch
+ eapply "${WORKDIR}"/patches/0040_all_darwin7.patch
+ eapply "${WORKDIR}"/patches/0050_all_strndup.patch
+ eapply "${WORKDIR}"/patches/0060_all_opessl_crypto.patch
+ eapply "${WORKDIR}"/patches/0070_all_solaris-basename.patch
+ eapply "${WORKDIR}"/patches/0080_all_gnutls.patch
+ eapply "${WORKDIR}"/patches/0090_all_debian-remote-addr.patch
+ eapply "${WORKDIR}"/patches/0100_all_ldflags.patch
+ eapply "${WORKDIR}"/patches/0110_all_stdint.patch
+ eapply "${WORKDIR}"/patches/0120_all_aliases.patch
+ eapply -p0 "${WORKDIR}"/patches/0130_all_garbage-writes.patch
# let's start by not using configure.in anymore as future autoconf
# versions will not support it.
@@ -65,11 +75,14 @@ src_prepare() {
}
src_configure() {
- econf \
- --sysconfdir="${EPREFIX}"/etc/ssmtp \
- $(use_enable ssl) $(use_with gnutls) \
- $(use_enable ipv6 inet6) \
+ local myeconfargs=(
+ --sysconfdir="${EPREFIX}"/etc/ssmtp
+ $(use_enable ssl) $(use_with gnutls)
+ $(use_enable ipv6 inet6)
--enable-md5auth
+ )
+
+ econf "${myeconfargs[@]}"
}
src_compile() {
@@ -86,15 +99,15 @@ src_install() {
insinto /etc/ssmtp
doins ssmtp.conf revaliases
- local conffile="${ED}etc/ssmtp/ssmtp.conf"
+ local conffile="${ED}/etc/ssmtp/ssmtp.conf"
# Sorry about the weird indentation, I couldn't figure out a cleverer way
# to do this without having horribly >80 char lines.
sed -i -e "s:^hostname=:\n# Gentoo bug #47562\\
-# Commenting the following line will force ssmtp to figure\\
-# out the hostname itself.\n\\
-# hostname=:" \
- "${conffile}" || die "sed failed"
+ # Commenting the following line will force ssmtp to figure\\
+ # out the hostname itself.\n\\
+ # hostname=:" \
+ "${conffile}" || die "sed failed"
# Comment rewriteDomain (bug #243364)
sed -i -e "s:^rewriteDomain=:#rewriteDomain=:" "${conffile}"