summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'mail-client/s-nail')
-rw-r--r--mail-client/s-nail/Manifest2
-rw-r--r--mail-client/s-nail/metadata.xml7
-rw-r--r--mail-client/s-nail/s-nail-14.9.24.ebuild (renamed from mail-client/s-nail/s-nail-14.9.22.ebuild)40
3 files changed, 32 insertions, 17 deletions
diff --git a/mail-client/s-nail/Manifest b/mail-client/s-nail/Manifest
index 15d4934233e9..013239401976 100644
--- a/mail-client/s-nail/Manifest
+++ b/mail-client/s-nail/Manifest
@@ -1 +1 @@
-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
diff --git a/mail-client/s-nail/metadata.xml b/mail-client/s-nail/metadata.xml
index 6fa99b2c089c..3a5e3dc2c701 100644
--- a/mail-client/s-nail/metadata.xml
+++ b/mail-client/s-nail/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>grknight@gentoo.org</email>
- <name>Brian Evans</name>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="net">
Enable support for network protocols (POP, IMAP and SMTP). If you
diff --git a/mail-client/s-nail/s-nail-14.9.22.ebuild b/mail-client/s-nail/s-nail-14.9.24.ebuild
index 84da1ddab7e6..b42c54f02541 100644
--- a/mail-client/s-nail/s-nail-14.9.22.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.24.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
HOMEPAGE="https://www.sdaoden.eu/code.html"
DESCRIPTION="Enhanced mailx-compatible mail client based on Heirloom mailx (nail)"
@@ -11,8 +11,8 @@ 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"
+KEYWORDS="amd64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="idn kerberos net +split-usr ssl"
RDEPEND="
sys-libs/ncurses:0=
@@ -27,12 +27,27 @@ RDEPEND="
!mail-client/nail
"
DEPEND="${RDEPEND}"
-BDEPEND="virtual/awk"
+BDEPEND="
+ app-arch/xz-utils[extra-filters(-)]
+ app-alternatives/awk
+"
src_configure() {
+ has_cflag() {
+ local x var="CFLAGS[*]"
+ for x in ${!var} ; do
+ [[ ${x} == $1 ]] && return 0
+ done
+ return 1
+ }
+
+ # Fails to build without replace Bug 860357
+ replace-flags -O[0gs] -O1
+ # A valid -O option is necessary Bug 888613
+ has_cflag -O* || append-cflags -O1
+ append-cflags -std=c99
local confopts=(
- CC=$(tc-getCC)
- EXTRA_CFLAGS=-std=c99
+ CC="$(tc-getCC)"
strip=/bin/true
OPT_AUTOCC=no
VAL_PREFIX="${EPREFIX}"/usr
@@ -54,7 +69,8 @@ src_configure() {
tc-is-cross-compiler && confopts+=( OPT_CROSS_BUILD=yes )
- emake "${confopts[@]}" config
+ # Cannot use emake or bad options saved Bug 879065
+ make "${confopts[@]}" config || die
}
src_compile() {
@@ -77,8 +93,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