mail-mta/msmtp: Revbumps to rename "libsecret" to "gnome-keyring"

USE flag. Package-Manager: Portage-2.3.49, Repoman-2.3.10
johu · Sep 5, 2018 · ede2d4a · ede2d4a
1 parent 196da06
commit ede2d4a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/mail-mta/msmtp/metadata.xml b/mail-mta/msmtp/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="daemon">Build/install msmtpd MTA daemon</flag>
 		<flag name="mta">Enable this to install as system-wide MTA</flag>
-		<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">msmtp</remote-id>

diff --git a/mail-mta/msmtp/msmtp-1.6.6.ebuild → mail-mta/msmtp/msmtp-1.6.6-r1.ebuild b/mail-mta/msmtp/msmtp-1.6.6.ebuild → 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 → mail-mta/msmtp/msmtp-1.6.8-r2.ebuild b/mail-mta/msmtp/msmtp-1.6.8-r1.ebuild → 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 → mail-mta/msmtp/msmtp-1.8.0-r1.ebuild b/mail-mta/msmtp/msmtp-1.8.0.ebuild → 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[@]}"
 }