From ede2d4afbe38514f959b9226755310cdb31a7aa6 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 5 Sep 2018 16:56:54 +0200 Subject: [PATCH] mail-mta/msmtp: Revbumps to rename "libsecret" to "gnome-keyring" USE flag. Package-Manager: Portage-2.3.49, Repoman-2.3.10 --- mail-mta/msmtp/metadata.xml | 1 - .../{msmtp-1.6.6.ebuild => msmtp-1.6.6-r1.ebuild} | 6 +++--- .../{msmtp-1.6.8-r1.ebuild => msmtp-1.6.8-r2.ebuild} | 10 +++++----- .../{msmtp-1.8.0.ebuild => msmtp-1.8.0-r1.ebuild} | 10 +++++----- 4 files changed, 13 insertions(+), 14 deletions(-) rename mail-mta/msmtp/{msmtp-1.6.6.ebuild => msmtp-1.6.6-r1.ebuild} (94%) rename mail-mta/msmtp/{msmtp-1.6.8-r1.ebuild => msmtp-1.6.8-r2.ebuild} (94%) rename mail-mta/msmtp/{msmtp-1.8.0.ebuild => msmtp-1.8.0-r1.ebuild} (95%) diff --git a/mail-mta/msmtp/metadata.xml b/mail-mta/msmtp/metadata.xml index 96c999d09eaa7..472d3fa70d20d 100644 --- a/mail-mta/msmtp/metadata.xml +++ b/mail-mta/msmtp/metadata.xml @@ -8,7 +8,6 @@ Build/install msmtpd MTA daemon Enable this to install as system-wide MTA - Enable libsecret support to store login credentials msmtp diff --git a/mail-mta/msmtp/msmtp-1.6.6.ebuild b/mail-mta/msmtp/msmtp-1.6.6-r1.ebuild similarity index 94% rename from mail-mta/msmtp/msmtp-1.6.6.ebuild rename to mail-mta/msmtp/msmtp-1.6.6-r1.ebuild index f988628e16526..af7968d17b2b1 100644 --- a/mail-mta/msmtp/msmtp-1.6.6.ebuild +++ b/mail-mta/msmtp/msmtp-1.6.6-r1.ebuild @@ -11,11 +11,11 @@ SRC_URI="mirror://sourceforge/msmtp/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc gnutls idn libressl libsecret +mta nls sasl ssl vim-syntax" +IUSE="doc gnome-keyring gnutls idn libressl +mta nls sasl ssl vim-syntax" CDEPEND=" + gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn:= ) - libsecret? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( @@ -68,7 +68,7 @@ src_configure() { $(use_with ssl ssl $(usex gnutls gnutls openssl)) \ $(use_with sasl libgsasl) \ $(use_with idn libidn) \ - $(use_with libsecret ) + $(use_with gnome-keyring libsecret) } src_compile() { diff --git a/mail-mta/msmtp/msmtp-1.6.8-r1.ebuild b/mail-mta/msmtp/msmtp-1.6.8-r2.ebuild similarity index 94% rename from mail-mta/msmtp/msmtp-1.6.8-r1.ebuild rename to mail-mta/msmtp/msmtp-1.6.8-r2.ebuild index f560ab7edffa6..2716f7113dcfe 100644 --- a/mail-mta/msmtp/msmtp-1.6.8-r1.ebuild +++ b/mail-mta/msmtp/msmtp-1.6.8-r2.ebuild @@ -12,11 +12,11 @@ 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 ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc gnutls idn libressl libsecret +mta nls sasl ssl vim-syntax" +IUSE="doc gnome-keyring gnutls idn libressl +mta nls sasl ssl vim-syntax" DEPEND=" + gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn:= ) - libsecret? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( @@ -66,10 +66,10 @@ src_prepare() { src_configure() { local myeconfargs=( $(use_enable nls) - $(use_with ssl tls $(usex gnutls gnutls openssl)) - $(use_with sasl libgsasl) + $(use_with gnome-keyring libsecret) $(use_with idn libidn) - $(use_with libsecret) + $(use_with sasl libgsasl) + $(use_with ssl tls $(usex gnutls gnutls openssl)) ) econf "${myeconfargs[@]}" } diff --git a/mail-mta/msmtp/msmtp-1.8.0.ebuild b/mail-mta/msmtp/msmtp-1.8.0-r1.ebuild similarity index 95% rename from mail-mta/msmtp/msmtp-1.8.0.ebuild rename to mail-mta/msmtp/msmtp-1.8.0-r1.ebuild index cdcd70d34ec2b..bfd8ac0fa06d9 100644 --- a/mail-mta/msmtp/msmtp-1.8.0.ebuild +++ b/mail-mta/msmtp/msmtp-1.8.0-r1.ebuild @@ -12,7 +12,7 @@ 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 ~x86-linux ~ppc-macos ~x86-macos" -IUSE="daemon doc idn libsecret +mta nls sasl ssl vim-syntax" +IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax" # fcaps.eclass unconditionally defines "filecaps" USE flag which we need for # USE="daemon" in order to set the caps we need. @@ -21,7 +21,7 @@ REQUIRED_USE="daemon? ( filecaps )" # Upstream discourages usage of openssl. See also # https://marlam.de/msmtp/news/openssl-discouraged/ DEPEND=" - libsecret? ( app-crypt/libsecret ) + gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) @@ -65,10 +65,10 @@ src_configure() { local myeconfargs=( $(use_enable nls) $(use_with daemon msmtpd) - $(use_with ssl tls gnutls) - $(use_with sasl libgsasl) + $(use_with gnome-keyring libsecret) $(use_with idn libidn) - $(use_with libsecret) + $(use_with sasl libgsasl) + $(use_with ssl tls gnutls) ) econf "${myeconfargs[@]}" }