gentoo auto-resync : 05:12:2022 - 03:04:53

3 files changed, 6 insertions, 99 deletions

diff --git a/mail-client/s-nail/Manifest b/mail-client/s-nail/Manifest
index 41e3741eeb2c..e7a027da0fd6 100644
--- a/mail-client/s-nail/Manifest
+++ b/mail-client/s-nail/Manifest
@@ -1,5 +1,3 @@
-DIST s-nail-14.9.22.tar.xz 799296 BLAKE2B 4db1b74be9de38d8879b00852545840aa50022f44efc42bc338575111e391db527ba850033a9f25e6d0269f68673a13bbdcd2609c0e74fb88c409040be2d165b SHA512 016e3403fbb3d9954c160690184545fdb4fc384ffb13b146ac8b60b40e43ad1b1a8967f4660904d40a99071eb1addf2b1dd98b06c6033a1a886379c05fc0c9be
 DIST s-nail-14.9.24.tar.xz 803100 BLAKE2B 4d82c747ff082a1a13d8832eb2bf1e96f05d6b3cf61c77a67bc061b1971032b41d8f5fe5520b96b9b74bc4d0661a4a9ef0f8f93b5e7b9eef66906b78260cef2f SHA512 03f6a6f446391b6f91ed3c8875c3e7fdfac9d4e77ea1d52a7e98aa84cfd0edae137d5b9afba3bdc9a31ab67cee5237930b74b42ae3acb54aee4758553a4f1df2
-EBUILD s-nail-14.9.22.ebuild 2005 BLAKE2B b2aa754f310792ac1d8c2dcfbcda0c826d18b14ae076c5b3f400d21d7a326709c5b443f36f39a3e3440a7524931d7834ab4aad7937065e8aeef8bf16f4f06bdb SHA512 6748f71ea0dab81f5f6473352927e0beb85f615f4f2f176601058954aeb2e37c3a43cc76201b49c5b699e175ceb7cccb2b15c4596fbc0fdc301b4e0b7bcfe509
-EBUILD s-nail-14.9.24.ebuild 2019 BLAKE2B dd48a7d752dde49bdd32d974b316f0790dc4e3cc8035525263e0488f57b2f4b6f185473ed9fdd1e79c39129cc6416b1d06e98306d73976f24a443e7e5afa8311 SHA512 0836043bbb5535149e4bcc5610a234242fb136e7595e8a88458fa56c9a16d6961b6a6ccc3b80969eadb5ea0172b883b316e02398c519e8790da2590cc97e2d90
+EBUILD s-nail-14.9.24.ebuild 2061 BLAKE2B 8abe2329b3c16bc4bbe935ee042e54fa1c1ddd9beefcbf04dfc00c83fb33407a3b03b195bff0348c3851b162bc36b04a524eb5b0e2bbd7b32b7dac56d01d3cca SHA512 80510e5f7d293e9958a0c8ff7fd3b0ad1dea3bf1813b948cfbdf03882f1ad0298638d84d3f3bdc8d6e4facd713bef3bb398a3fb067cab60414a9039458945de0
 MISC metadata.xml 828 BLAKE2B 7664d3cb16b1dfe54ed2ab4d06e379402c593069008000dff1ef533182ef16cc90b6384d6a09c8fe982afa7deba65782d3fe13c86f322b639c9c0e89aee4f525 SHA512 eef6877163f7fcabbf4da6574483db2d37889ae3c298ee994a38cd9703554cd565e74ac70cc41317028d47050875ddbe2fe109c7e04b97e1f45b56acdda27b0a
diff --git a/mail-client/s-nail/s-nail-14.9.22.ebuild b/mail-client/s-nail/s-nail-14.9.22.ebuild
deleted file mode 100644
index 5dd4cf9fe267..000000000000
--- a/mail-client/s-nail/s-nail-14.9.22.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-HOMEPAGE="https://www.sdaoden.eu/code.html"
-DESCRIPTION="Enhanced mailx-compatible mail client based on Heirloom mailx (nail)"
-LICENSE="BSD BSD-4 ISC RSA"
-
-SRC_URI="https://ftp.sdaoden.eu/${P}.tar.xz"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="idn kerberos net ssl"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	virtual/libiconv
-	idn? ( net-dns/libidn2 )
-	net? (
-		ssl? ( dev-libs/openssl:0= )
-		kerberos? ( virtual/krb5 )
-	)
-	!mail-client/mailx
-	!net-mail/mailutils
-	!mail-client/nail
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils[extra-filters(-)]
-	app-alternatives/awk
-"
-
-src_configure() {
-	local confopts=(
-		CC="$(tc-getCC)"
-		EXTRA_CFLAGS=-std=c99
-		strip=/bin/true
-		OPT_AUTOCC=no
-		VAL_PREFIX="${EPREFIX}"/usr
-		VAL_SYSCONFDIR="${EPREFIX}"/etc
-		VAL_MTA="${EPREFIX}/usr/sbin/sendmail"
-		VAL_MAIL='/var/spool/mail'
-		VAL_PAGER=less
-		$(usex idn VAL_IDNA=idn2 OPT_IDNA=no)
-		VERBOSE=1
-	)
-
-	if use net; then
-		confopts+=( OPT_TLS=$(usex ssl require no)
-			OPT_GSSAPI=$(usex kerberos require no)
-		)
-	else
-		confopts+=( OPT_NET=no )
-	fi
-
-	tc-is-cross-compiler && confopts+=( OPT_CROSS_BUILD=yes )
-
-	# Cannot use emake or bad options saved Bug 879065
-	make "${confopts[@]}" config || die
-}
-
-src_compile() {
-	emake build
-}
-
-src_install() {
-	# Use /usr/sbin/sendmail by default and provide an example
-	cat <<- EOSMTP >> nail.rc
-
-		# Use the local sendmail (/usr/sbin/sendmail) binary by default.
-		# (Uncomment the following line to use a SMTP server)
-		#set smtp=localhost
-
-		# Ask for CC: list too.
-		set askcc
-	EOSMTP
-
-	emake DESTDIR="${D}" install
-
-	dodoc INSTALL NEWS README THANKS
-
-	dodir /bin
-	dosym ../usr/bin/mailx /bin/mail
-	dosym s-nail /usr/bin/mailx
-	dosym mailx /usr/bin/mail
-	dosym mailx /usr/bin/Mail
-
-	dosym s-nail.1 /usr/share/man/man1/mailx.1
-	dosym mailx.1 /usr/share/man/man1/mail.1
-	dosym mailx.1 /usr/share/man/man1/Mail.1
-}
diff --git a/mail-client/s-nail/s-nail-14.9.24.ebuild b/mail-client/s-nail/s-nail-14.9.24.ebuild
index bcd89a795767..6d95aeba874e 100644
--- a/mail-client/s-nail/s-nail-14.9.24.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.24.ebuild
@@ -12,7 +12,7 @@ LICENSE="BSD BSD-4 ISC RSA"
 SRC_URI="https://ftp.sdaoden.eu/${P}.tar.xz"
 SLOT="0"
 KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="idn kerberos net ssl"
+IUSE="idn kerberos net +split-usr ssl"
 
 RDEPEND="
 	sys-libs/ncurses:0=
@@ -81,8 +81,10 @@ src_install() {
 
 	dodoc INSTALL NEWS README THANKS
 
-	dodir /bin
-	dosym ../usr/bin/mailx /bin/mail
+	if use split-usr ; then
+		dodir /bin
+		dosym ../usr/bin/mailx /bin/mail
+	fi
 	dosym s-nail /usr/bin/mailx
 	dosym mailx /usr/bin/mail
 	dosym mailx /usr/bin/Mail