mail-mta/courier: [QA] Fix USE=libressl semantics

Closes: https://bugs.gentoo.org/684002
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: David Seifert <soap@gentoo.org>

5 files changed, 38 insertions, 29 deletions

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