gentoo resync : 28.04.2019

6 files changed, 43 insertions, 34 deletions

diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 77550f995adc..709ff37c64df 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -6,9 +6,9 @@ DIST courier-0.75.0.tar.bz2 6970339 BLAKE2B 2c2f9900ab0370eff8b1a62759295e2d0598
 DIST courier-0.76.4.tar.bz2 7237424 BLAKE2B 7dbfb43cef75ed5187e044130c6cb793848791956a8531fcc54ae7a444e475c16219816c2ad7834e3b5349cf945f59023f0b9e2415c7c64352b5aa71eaf00bbd SHA512 6350ef5e30bd1e4921350bf3a09de0b56513530852c93f9a06e23625e49ae09d7ff26558da1f816a5bb492579afb5c1cbcf7573199bf898a039cd3607e847c30
 DIST courier-0.78.2.tar.bz2 7379529 BLAKE2B 5ba1ef013e513b269746999b2dd75f37fe8a9f1d87a51b61db1a8100c9a5cd022039462c235d35a95cf14ac5c406becf0f5d4f9344462e862045dc7333b7a0b7 SHA512 376de08cbaf9c2c74cd79e5d42680d8d6c31ecf0b0ef014f4152aa857224ba3e6d9e0f91b5097d15dcb5de9a5603a4707bc9b78902a5934c0a0ca68b74212055
 DIST courier-1.0.5.tar.bz2 7465054 BLAKE2B 55e9ba2a85889e7210652475149f4d3e687fd63a27b44a5a16c888b2f60bb18c4156e3344792585fed2ee3d81770e79c55ce5791842c255b8701bad5d2f8af4e SHA512 99a8e98633da99abd1f6f4e24328d4655526d51dc9fc03ffcb9c1e0cce0e608dedb2ac9511829af4487ff5af4618500d6fbbee26568f2a05e3c9d3cf3b48b2a5
-EBUILD courier-0.75.0-r1.ebuild 9430 BLAKE2B 7bb9c5b9fe5a8f50ec6c17a9c4b99e2e07ad63fb60c5375f72891cb4b8075eba953a45519609798c7b62da1bd5359462481afe65f6e5f3d90e583d08886f1538 SHA512 ac92980554eabfc6c9787519a8bccef2dc0db2bb83306618f0d2ab3b0d7e44fc3dfc58f9f2d679b41dfee2cc20eb371fa23dd6a37ff06f4d8c8e10cf68fe17a3
-EBUILD courier-0.75.0.ebuild 9325 BLAKE2B 7103206f2ba73b4acc5097ab7e14595013c051042f64ec42b4a3c2b3430d7830638cef2386c38495fafbd8eb2002396b853a1eb43548fce6460541f3b8724823 SHA512 71aa350b36bb024805fd56adcb56b30a100d5cf0ce5da1bf14027dd51d8abf4d933a6153064e0f688b80019771e427d689d59bdc1e5839f600013c9fb8f5af18
-EBUILD courier-0.76.4.ebuild 9327 BLAKE2B 6daccaf5e311202f157887017b63e5e890595ed73a0c52cd87e1ddcf0b3d31666c4bbd443116868efe9b555661b94da8c575d1cb21dabf6c3fe64248f2488ec3 SHA512 91a9cf8f9f2953b97793e6c1fe3db0e3e0eeb81692a8604eef46736b58584235bff3194db8d4de2d062e4d90a267c2e578623f8a2c4e710b7092273096672a90
-EBUILD courier-0.78.2.ebuild 9326 BLAKE2B 67554fcb0129810772ff951205ea84f640fb24da44a2b65f87535b14069e58868f7c7c55e77f6533a5530710954eb4c3d8d5545191f190c13ca95b4f95da6628 SHA512 e4993a1480d23f2b75400626d9f5ba0ef5f212ed44181383ced92c3648ed99efe59d684128c55296240c80f85ff42d7161412856f7eea2754f319078278fcf0f
-EBUILD courier-1.0.5.ebuild 9567 BLAKE2B 6b482278681225739557aba5080ececca263017e077592e3e4dfee9cec563078642132fc2950a219c16be6004fb6055a8ec4da3f74a2ba5c59659715c1376e3d SHA512 372b07ad49073ec8b5feb5ee08b5a58a713090dce71b7acbba8a650ada63ee4bda0d9d2a59f089f034266ff0ca709a84724dda70b685709caf4b8ab3d67c57fc
+EBUILD courier-0.75.0-r1.ebuild 9400 BLAKE2B 12243ba87ec94300e956c196f64b048bf0501e22c1ab6de69ccce1689e90e991038fa69aba6f7050080a7a908f77505d3a2a8c070c1499ed7d12460ec8efb845 SHA512 f3f284116e04d535c4d58b6bf95c2a252b3a85cef27b41cc72a658671b3f0979de70ab0938536a5537dd2be171839fbe00f76eedd948cddb4df3d5ef5cd7d71f
+EBUILD courier-0.75.0.ebuild 9328 BLAKE2B 86a2d5226ab9bc935c311d502c19b3a87eff8e4a15669d49e3bfc4e4d139758d2f87f2e99e9d3e3401f817274422b9cbc86c9931275a7d011695004d03a3e3df SHA512 d0bb1fb52b3d310fb271330be96f5946e4116167b22eeaa15021a9ecf9b03266a67d6ae0f217e4bfb0313fc15b35ed455aa1ed55190072a49a6ae8af7e4a11c7
+EBUILD courier-0.76.4.ebuild 9294 BLAKE2B c60f3eb3bd5ef6f025d21689927833745ba1d2c647e811524b60640620d58b23e0e1a656c491b686c2d4a10005011b4c9315e514b642417e320e39949aa5e16a SHA512 5ea78392e78be754ebb7451ba048015d4618f7323a86d83fe66f10932dccc794b6820817ecd36f29a1865163cabd9234946f40dc1ed72c21cf91b14933cc7b97
+EBUILD courier-0.78.2.ebuild 9293 BLAKE2B 97cbd1ffdca33ba984f06e71d723023b6aba88c282e751779bed02f2422e6c4094e3fde7b5a57f3aa54b78583dc928f24103ba931f454cbe862bbf6a84a23869 SHA512 df230c508df13d2fdc03571250af71e53c1309e665428a1b2a375965684cd07e6426847bc5f9e0eb66cd42e4bd24741d46a26398bd0d46bfa77cbf81442e7e84
+EBUILD courier-1.0.5.ebuild 9537 BLAKE2B 90caac308071567ca7fccbb903a7e60fd52e0172920679c428c0d3a6a7fc52e361da82eceeedda1cab699c2748deadf583bb283568903234fec4d3a2a4220a49 SHA512 66c974b237d1c01c52f2aecbd95263d6b77aff4b15ba48420933e8e614564abdbeb070b6031e6ca6fb5a814cb2ae3658bdda4590c3bdc943e11d78be61604700
 MISC metadata.xml 755 BLAKE2B 8ec0dd31ad59193d95585ab88f0bac6ced87132444a4136b2c2f80458a11f5296c42283574c3b56c26a31dad25fff530ebbfbf1ef467a1b824d11afe93a6da31 SHA512 de15af05e98deba4d3b297b4301439d892c3ba0d8af30ca459fcac72bf0179de87bf11260b8bfdb3827dd1f0e5123d68817766ffe037cece9c30adb3e8bd8b06
diff --git a/mail-mta/courier/courier-0.75.0-r1.ebuild b/mail-mta/courier/courier-0.75.0-r1.ebuild
index 7a2173aee9f0..2fe60c5412cd 100644
--- a/mail-mta/courier/courier-0.75.0-r1.ebuild
+++ b/mail-mta/courier/courier-0.75.0-r1.ebuild
@@ -5,23 +5,25 @@ EAPI=5
 inherit eutils flag-o-matic multilib
 
 DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="http://www.courier-mta.org/"
-SLOT="0"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
 LICENSE="GPL-2"
+SLOT="0"
 # not in keywords due to missing dependencies:
 # ~s390 ~ppc64 ~alpha ~ia64 ~sparc ~x86
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
 IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail gnutls"
-REQUIRED_USE="?? ( gnutls libressl )"
 
 DEPEND="
 	>=net-libs/courier-authlib-0.66.3
 	>=net-libs/courier-unicode-1.3
-	!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )
-	libressl? ( dev-libs/libressl:= )
-	gnutls? ( net-libs/gnutls )
+	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
diff --git a/mail-mta/courier/courier-0.75.0.ebuild b/mail-mta/courier/courier-0.75.0.ebuild
index 3e048db1fd84..6d13f06826bb 100644
--- a/mail-mta/courier/courier-0.75.0.ebuild
+++ b/mail-mta/courier/courier-0.75.0.ebuild
@@ -5,10 +5,11 @@ EAPI=5
 inherit eutils flag-o-matic multilib
 
 DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="http://www.courier-mta.org/"
-SLOT="0"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
 LICENSE="GPL-2"
+SLOT="0"
 # not in keywords due to missing dependencies:
 # ~s390 ~ppc64 ~alpha ~ia64 ~sparc ~x86
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc s390 sparc x86"
@@ -19,7 +20,7 @@ DEPEND="
 	>=net-libs/courier-authlib-0.66.3
 	>=net-libs/courier-unicode-1.3
 	!gnutls? ( dev-libs/openssl:0= )
-	gnutls? ( net-libs/gnutls )
+	gnutls? ( net-libs/gnutls:= )
 	>=sys-libs/gdbm-1.8.0
 	dev-libs/libpcre
 	app-misc/mime-types
diff --git a/mail-mta/courier/courier-0.76.4.ebuild b/mail-mta/courier/courier-0.76.4.ebuild
index f1b0aa79e0c5..afb85de4a681 100644
--- a/mail-mta/courier/courier-0.76.4.ebuild
+++ b/mail-mta/courier/courier-0.76.4.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils flag-o-matic multilib
 
 DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="http://www.courier-mta.org/"
-SLOT="0"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
 LICENSE="GPL-2"
+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"
-REQUIRED_USE="?? ( gnutls libressl )"
 
 DEPEND="
 	>=net-libs/courier-authlib-0.66.3
 	>=net-libs/courier-unicode-1.4
-	!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )
-	libressl? ( dev-libs/libressl:= )
-	gnutls? ( net-libs/gnutls )
+	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
diff --git a/mail-mta/courier/courier-0.78.2.ebuild b/mail-mta/courier/courier-0.78.2.ebuild
index 9c648ef0233e..e289ecf157ee 100644
--- a/mail-mta/courier/courier-0.78.2.ebuild
+++ b/mail-mta/courier/courier-0.78.2.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils flag-o-matic multilib
 
 DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="http://www.courier-mta.org/"
-SLOT="0"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
 LICENSE="GPL-2"
+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"
-REQUIRED_USE="?? ( gnutls libressl )"
 
 DEPEND="
 	>=net-libs/courier-authlib-0.68.0
 	>=net-libs/courier-unicode-2.0
-	!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )
-	libressl? ( dev-libs/libressl:= )
-	gnutls? ( net-libs/gnutls )
+	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
diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild
index 66a941947aa6..f0b3ece74ea8 100644
--- a/mail-mta/courier/courier-1.0.5.ebuild
+++ b/mail-mta/courier/courier-1.0.5.ebuild
@@ -5,22 +5,24 @@ EAPI=7
 inherit eutils flag-o-matic multilib
 
 DESCRIPTION="An MTA designed specifically for maildirs"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="http://www.courier-mta.org/"
-SLOT="0"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail gnutls"
-REQUIRED_USE="?? ( gnutls libressl )"
 
 DEPEND="
 	>=net-libs/courier-authlib-0.69.0-r1
 	>=net-libs/courier-unicode-2.1
 	net-dns/libidn:=
-	!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )
-	libressl? ( dev-libs/libressl:= )
-	gnutls? ( net-libs/gnutls )
+	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