gentoo resync : 23.06.2018

10 files changed, 200 insertions, 4 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 2728639a07db..1f95096731c0 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index a30cc823e3f1..579d963aca5b 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -23,5 +23,5 @@ DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ec
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.90.1-r1.ebuild 12215 BLAKE2B 24752c4aa059d967300f5ab90f647e1f4b35e8e475bb3a436e6669aff6b552b78b290705658840ae1f4828d3f3a7c7a0114c7c4790421220c71e569d33f1175a SHA512 c33b0998024ecb9e25e95d4c22a474f8819c634d189736e8c9d8605d27bfba80275fb80c12db4be04ce67a3e2646c670a8c7f68c0aadf9937d626ad1fa0528be
 EBUILD exim-4.91-r1.ebuild 12582 BLAKE2B 40a2a61532589db358ed6ca235e46a024d51c27af18458219369d4ca1a6cbbf33eca8b18b369303629441485a621753fd14c681737b198172c360feab88c5f83 SHA512 0a2cf3be8f22bf0b16a496ee4de78ddcb645b0abfcfa696e18de6506b7cbf3ccb292089e9c5475b4813c105ebdd81ec2ec0f8bce3195cb2bd936cf58ae04c662
-EBUILD exim-4.91-r2.ebuild 12675 BLAKE2B 6564eb4907518fc9f455746eac7624fafc7d355b5915800be3aa212f1b9f9d40739c234ab527e471b9f57d11b1b3665f58e7e5da2e6c3c9170882ec930b27581 SHA512 1f2f6394522a7929da5df6a5b734f77daf07ec949457cbae4069b7803fb6f04f8fe86e1e7066a4d42f864ee006e100d75d93575fde6e1d7e97fa9a9f55ce7ec5
+EBUILD exim-4.91-r2.ebuild 12674 BLAKE2B 4a52c57938af93f2f03753756403b3566a99955652f3e2769057b32a8bde1c213b761dc676f0bfa20825ba5d340ff151bc3a973195b48c951a20cec28f068be1 SHA512 f1f2fdcef9cb2693eadb19226f8d0c328e3a2ce323a9c8557c68711651a7623dbdaa9d6ce440684a48ce70ddc21078aa16a91f1cf35299e3f1e4a8e5661ab5ee
 MISC metadata.xml 2562 BLAKE2B b6eecf1c5ab931f7e0cd1524efcd4408cae9a4788b04ff7e0667aaa38dea77151bbfc0fddce5cedaca1e06e081f0f050106bb374be2beaa93e21ab350cd6f6bf SHA512 74abffc1cdcc3f1d15644422519d248772f7024c76f612bbad33a2b720043f92c82623598bcd9766ce141a8196224f7cd35ce155c11692346c950b20e8657382
diff --git a/mail-mta/exim/exim-4.91-r2.ebuild b/mail-mta/exim/exim-4.91-r2.ebuild
index 5e542b3cba07..310bcc4fa3ba 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 0c10e55659e3..10cbc98bf30f 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,3 +1,5 @@
 DIST msmtp-1.6.6.tar.xz 283744 BLAKE2B 41745d9f20a33b0e4c6f7eee3ad5897c5a555a8cd1e27eb0bf7d347054d072b9eadfc7a31583e12a4f35f071aa710bb403980cba0e06920f65fdb727c786447b SHA512 30f33648b66a6b230cd38d0eee4c916a631a51bddcc1a15c9f7b324305506cb83b9c95f95def9150d0b783d38000db409981331b3c6a756232f0ce49e9b343ab
+DIST msmtp-1.6.7.tar.xz 293208 BLAKE2B 9d493c45a96a0e5e7278d9af89ff74dff92b8699076f17ae556030df55861b2fa9a06f677d2641744ba2a55989ebdc981ae1902c99884675562dd03586768ec9 SHA512 453d4196168a7ad2413cf2a91af25ed8ec73b04ea12f8cc40f6342a892baeb9edfbeba4a555a3a22d11881b831b4cd11b5f2844f66f2a6e7b891422edd9c68d9
 EBUILD msmtp-1.6.6.ebuild 2963 BLAKE2B 888b4350f2128a11ca0f021dd2780bf774bcfed0865cc40fb2b8de7b743c8c235c40e10b241ba71277e8fedcb65d59d9a952226be239fb4736b6de92c456be1e SHA512 f71fc3f8e8c791c7609b72f4d5fc875a6e66719547f963637d8f16ed1f50014ce559e75b6c61de0eb4a80c28013bc897b8a6a75ad1357e894b68c2f6816a93c8
+EBUILD msmtp-1.6.7.ebuild 3011 BLAKE2B 9a7b702253fbec5765d3a94ffdc7c72da51bc755f5fa2deae8ef9a83efd732dd09717bdff8f78ebea7699f81b0e2d8e8ef732a13f5f416c2f713fdcaff2c0e93 SHA512 373436dcdd78fc48474935cce72ecc8af85c4e5dc11933522e4aed6224bf6dd15e059f745d7f7896a16cfdc3e63cb346407e4144d95f3907c2b64ab75e0a3738
 MISC metadata.xml 486 BLAKE2B e1ad25bbf9c7d8309ea8a47b67bb6c3b40230bc1764f6ca5ec4e735b4d34d983fcddf509bdfd7a8776162e313db6d8a492d75835d69d32e8db54ec4f5c6ccf5c SHA512 d52248bba8e2702bb75568c239de59d57592d5957ef4724079c5b75ecfff1ad7e193fe85a6d98cd49a6d462178dae3adc43b41a3869169c122c95990b066c820
diff --git a/mail-mta/msmtp/msmtp-1.6.7.ebuild b/mail-mta/msmtp/msmtp-1.6.7.ebuild
new file mode 100644
index 000000000000..73c12e7a084f
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.6.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
+HOMEPAGE="https://marlam.de/msmtp/"
+SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc gnutls idn libressl libsecret +mta nls sasl ssl vim-syntax"
+
+CDEPEND="
+	idn? ( net-dns/libidn:= )
+	libsecret? ( app-crypt/libsecret )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+"
+
+RDEPEND="${CDEPEND}
+	net-mail/mailbase
+	mta? (
+		!mail-mta/courier
+		!mail-mta/esmtp
+		!mail-mta/exim
+		!mail-mta/mini-qmail
+		!mail-mta/netqmail
+		!mail-mta/nullmailer
+		!mail-mta/postfix
+		!mail-mta/qmail-ldap
+		!mail-mta/sendmail
+		!mail-mta/opensmtpd
+		!<mail-mta/ssmtp-2.64-r2
+		!>=mail-mta/ssmtp-2.64-r2[mta]
+	)
+"
+
+DEPEND="${CDEPEND}
+	doc? ( virtual/texi2dvi )
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
+
+src_prepare() {
+	# Use default Gentoo location for mail aliases
+	sed -i 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh || die
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_with ssl ssl $(usex gnutls gnutls openssl))
+		$(use_with sasl libgsasl)
+		$(use_with idn libidn)
+		$(use_with libsecret )
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		cd doc || die
+		emake html pdf
+	fi
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		dohtml doc/msmtp.html
+		dodoc doc/msmtp.pdf
+	fi
+
+	if use mta ; then
+		dodir /usr/sbin
+		dosym ../bin/msmtp /usr/sbin/sendmail
+		dosym msmtp /usr/bin/sendmail
+		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/vim/msmtp.vim
+	fi
+
+	insinto /etc
+	newins doc/msmtprc-system.example msmtprc
+
+	src_install_contrib find_alias find_alias_for_msmtp.sh
+	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
+	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
+	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo "Please edit ${ROOT}etc/msmtprc before first use."
+		einfo "In addition, per user configuration files can be placed"
+		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
+		einfo "/usr/share/doc/${PF}/ for an example."
+	fi
+}
+
+src_install_contrib() {
+	subdir="$1"
+	bins="$2"
+	docs="$3"
+	local dir=/usr/share/${PN}/${subdir}
+	insinto ${dir}
+	exeinto ${dir}
+	for i in ${bins} ; do
+		doexe scripts/${subdir}/${i}
+	done
+	for i in ${docs} ; do
+		newdoc scripts/${subdir}/${i} ${subdir}.${i}
+	done
+}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index d379d78e3411..82304ad08397 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -10,12 +10,12 @@ DIST postfix-3.1.6.tar.gz 4341308 BLAKE2B 6a5ec763cf96770240f63b35b4532c555cc6e5
 DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6a2045e83726a5e7305e6f9bf666ebcfb93a9ab1a96ec988431661059d62e926287bd13089eeb4bab3e8f4b9fc7 SHA512 6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8
 DIST postfix-3.2.6.tar.gz 4395159 BLAKE2B 2eef28f9189830725c02b98512ca7859770f090cbef3fe453b57fade967fd20f94cd3cd8e8955252dc230e674ed7827fc68ad910cd4fc63029dc2c92ea75f0af SHA512 081751fe9af7612e7ee01a80ceffbc09db60764e12099d2a5e053205d0e7c70c6ef4f96526e1a98780965c43354e0ccd6ef61b4dbe93b249179890b81836c705
 DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11 SHA512 2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
-DIST postfix-3.4-20180603.tar.gz 4428154 BLAKE2B a1f08ff767eac6e540df8d45d1cc9bd96b5dfd80d2bfa173656189aaf0d9a5266168b5babf903e326e972cca0ccff2eb6f076cff79122e811134738123761554 SHA512 bbc6e7c7abc1a68b0871a8b4fc6bbcdeb6a7889e067ae5e764b073875e5d737773e930a76b3183cc6121553e0a50420ae37f5751c03c5c7807df737ed02b8997
+DIST postfix-3.4-20180620.tar.gz 4452362 BLAKE2B fbde05701d7e7d6803db892789600001cb85db8eb3c64757d6d3fda3355477089d23bd3b7185cdb0006ccf12778613768125207284691ba654b648b1ae8b5a3a SHA512 35e6c03f45fd94b031b20c5d23df1dc92c1eedd4ea3a03938629ca8ace83eadb6a666e2f2571ba384550ad7b3c3260c565c6d1bb04b1da187ee6469d88ecb8c1
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62
 EBUILD postfix-2.10.9.ebuild 8730 BLAKE2B d10ef4dc24141ad4fd6acc2bffa201d4925260a02710fd9281e237bcbe88ba1612e666cdda248f1519b1d8dbb1a0304ffc2028e8df1a8779dd3557e3bfe90e3c SHA512 ce0cbaea68ca10358370f58f65fe1cdacaa5ab63d644c930c13b2187398790c1249a2e9256adc1c73df3a971fc8cd15473426578c7414cef15b27739d19260b8
 EBUILD postfix-3.1.6.ebuild 8661 BLAKE2B 707f1822c7e8359adc8f0884237069cd2092385eb4a55c378d2918ed097b596755a533cdf297895a3651572996b5dce8603e3dce8bea172acee60471cfce32c9 SHA512 6174266e057ca6110d39c76f6bd6d11fa24f40641599a90c143aa9396822d1cc2b3e72b7de94e849c913c5d34bf3dd081f29feedb41b2bfc349a6e567381550d
 EBUILD postfix-3.2.4.ebuild 8659 BLAKE2B d35c9cf049e257ac3c0fb713fc0059001c545e5aace98892a1c19e63774ba76a8f92bd3223e4cecd66b3801423fd67f668eb9644bb0b29dca091fec09b0272a1 SHA512 188a72188418f415701b9718c2302deea0216caf25e998f1ca386dd83368ff508524dbeb60dd198036462fc260015f7e2c179a4b1d77e662ac3c051d447f58d0
 EBUILD postfix-3.2.6.ebuild 8418 BLAKE2B 57b1fb8ab09cac0c4279e395433020080e5e5eea8e5cfc8f3a0ecdfdfc2cc25cb149d6de18e93d0ee3fa5d515283d1c7762a6a7ac514dd7a170955b26ab7d0df SHA512 c00559620978de33368e4241b25e6ebe096a651d3052b7f9a25fa09060c7df8634dc95b6fffda6a983da3ed47190f78c2dd5dd40ae0fdfaaedf10f427b32f459
 EBUILD postfix-3.3.1.ebuild 8425 BLAKE2B f3d19606dfc65e1cc50ca2c7fd15bb036194fd7e8076a10b1568249da34b8a5c3332a4ca401d7922d7a54a461d74102cdc75c5f32eee6db36dd6cacca78403f2 SHA512 997e9b1a332b686fe51d5ffca62af4c797a7741f2a4e36e2149e55ccd17a4e2a40640ddea00ebc253e8017933ff36626ab20175b2a5006461577e75987572b80
-EBUILD postfix-3.4_pre20180603.ebuild 8428 BLAKE2B 5dce6823ea07c5236a90319d8ccd7c6f623802d529668ab75dbb3cba631baf1906fcc3afc148ed64dcfe8de89104931c7419061c7c385dd964d9ee81d9d7cb1e SHA512 4d07e6c905fea18f981a59607a32d14f6e2cac82d7a317bbcc37ddc829ed804222cd987803268c73e5820249479bfddf1b448a76883758b16ccfde82b7c72f57
+EBUILD postfix-3.4_pre20180620.ebuild 8428 BLAKE2B 5dce6823ea07c5236a90319d8ccd7c6f623802d529668ab75dbb3cba631baf1906fcc3afc148ed64dcfe8de89104931c7419061c7c385dd964d9ee81d9d7cb1e SHA512 4d07e6c905fea18f981a59607a32d14f6e2cac82d7a317bbcc37ddc829ed804222cd987803268c73e5820249479bfddf1b448a76883758b16ccfde82b7c72f57
 MISC metadata.xml 903 BLAKE2B ad36e98f33e0538aa2cec74a6c7342e42a0e65fea2898b93a9a2e7cb81bddad130fd0eec89e554a3e8ca5d9399ef21ea47d9e16d39f070d8e9d325c45ca95356 SHA512 3159041e80f1b045d9beda6f517be0acd5a5eaca4b979e7ae2d27f6d7cc07ad83ba55a9e78b718689c9d6fff780e77d9b0c8275a1dec96bd84d2cd184d86662d
diff --git a/mail-mta/postfix/postfix-3.4_pre20180603.ebuild b/mail-mta/postfix/postfix-3.4_pre20180620.ebuild
index 3d763629f824..3d763629f824 100644
--- a/mail-mta/postfix/postfix-3.4_pre20180603.ebuild
+++ b/mail-mta/postfix/postfix-3.4_pre20180620.ebuild
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
new file mode 100644
index 000000000000..059be6aa2439
--- /dev/null
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -0,0 +1,3 @@
+DIST protonmail-bridge-1.0.4-1.x86_64.rpm 47422421 BLAKE2B 0846ce606feec1402e606a3b1bbe5c4431f804afc07e24689c77bcc64f211fe756a6890598e79cb6f6169a41a20158f7685b8d26a10fb91926abc77a5681ae20 SHA512 6d366ac02dec8ae3fa2bf188eff7cdaf6155c30386c76d29771362b573b3f3abc0e26df837955cb5f56d51ed1cd1b0b603911886478b5cfc7a750b2ee0077538
+EBUILD protonmail-bridge-bin-1.0.4.ebuild 858 BLAKE2B 046e247d796a7f77fb1d4339ede81bdf363dfaff8c50510163bd1ca857c63f67c2f30415563a7b61f896718a4b8b063cee57c53b712c47b45948e12ffec1b147 SHA512 6c6a351cc1d26ce14833bff9b9a1ecc14279fe616f99ac8780872e9290670e8dc6fca8e13ff26d64d8204718dc227993b9fc81c4253fbbded9a276db9fade7d5
+MISC metadata.xml 364 BLAKE2B dd954ec6767c68a6ae792b545fe4a11b15630bb77445e146aef6577f71a05d01cf52a8b6afac6dd304ed0d9429453edb16b3f47008b411f331e786bd33c01efd SHA512 542d4cde25dd2756b2927d22dab88cfd2b086b01fcfeafe93aa9bddcbc7b2878e2e048d379572bd06a59440c2b5b255d43dfb7dc8e1e4ce59a07ae7622948845
diff --git a/mail-mta/protonmail-bridge-bin/metadata.xml b/mail-mta/protonmail-bridge-bin/metadata.xml
new file mode 100644
index 000000000000..6bf484adc0d0
--- /dev/null
+++ b/mail-mta/protonmail-bridge-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lucianposton@pm.me</email>
+		<name>Lucian Poston</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.4.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.4.ebuild
new file mode 100644
index 000000000000..b00b93b20070
--- /dev/null
+++ b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.0.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://protonmail.com/bridge/"
+SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
+
+RESTRICT="bindist mirror"
+
+LICENSE="MIT protonmail-bridge-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/glib:2
+	media-sound/pulseaudio
+	virtual/opengl
+"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="*"
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR "${S}"/usr "${D}"/ || die "Failed to copy files"
+
+	dosym "Desktop-Bridge" "/usr/bin/${PN}" || die
+
+	cat <<-EOF > "${T}/50-${PN}" || die
+		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
+	EOF
+	insinto /etc/revdep-rebuild
+	doins "${T}/50-${PN}"
+}