mail-client/alpine: new version 2.21.1

Fix SRC_URI / HOMEPAGE
Closes: https://bugs.gentoo.org/639066
Closes: https://github.com/gentoo/gentoo/pull/6406

3 files changed, 93 insertions, 4 deletions

diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 6d2604cb2e73..37eaa3177093 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,3 +1,4 @@
 DIST alpine-2.00-chappa-115-all.patch.gz 212705 SHA256 1503ae09b6a4a74828e3472c4987b48a310f817e7fd93ca385724660aa234d7f SHA512 5e9fcb6a80dbd18bed26109caa6b7aa5eeb88de420861d9998c32f031e8279d6367c28b6670fb54203d1b14c3dc47cf5ad25b42e4949157de64f3f1fd36d0aa7 WHIRLPOOL d9fef2fb0a07acfb8ba4e5bedbc0140a09020967e52b16853907db47b1a7e35286022c2a03b1670fe377015393d22b27bfa9f12780de05bac1f3458a81f75527
 DIST alpine-2.00.tar.bz2 5222673 SHA256 c85db8405af90375ba2440c85b7952d80996154e9916b83acca558dc82e0a2a6 SHA512 17c6e65fbe767d4f9ffb3d3c2bb3deeab9d3620cd046cbb0009290aa484c9254effa992957631f0603bd82b82aeca2923d391aee6d20a7684d5830fbca8ce4d2 WHIRLPOOL 6c1fed63e826c12c6e39e8f79e2b33f3b85545e54c32fdbe918636086c0aaaa26073883946061a6b52df50af711b7d6bb6647a177f051afccccdbd0cf473bbc3
-DIST alpine-2.21.tar.xz 4720856 SHA256 6030b6881b8168546756ab3a5e43628d8d564539b0476578e287775573a77438 SHA512 a2a36a033c8af79810816a7da7185c269808ba6d84d013691fd8b3764c63f5fb2284e6844ec5a5e99d168514ae636debf59fae962533a2916679e4e9109c6264 WHIRLPOOL 54113ac1516e9f185ff4ed2841624145ec72514a8ce1d45c2907a8e5ad6b6e79ea6780d22d15a19053a69ae97cc2ef630ff8579ffe746a8b715d81a7db59a6d1
+DIST alpine-2.21.1.tar.gz 7490699 BLAKE2B f3aeafb55697701f6edda43659c9d27c7d7dab74f8e332e867f354ce555c26037f4b642af80f18db249dd7269f80bd880bc315ba4ae08ae7f63abc7998cea073 SHA512 78b47bd9e9dfc652bc407fe736d8b7526625782c332803cf01e5214a2b0a5af21736b8a2e685348913f6e2b10c80dced12081202294e9c61e3168b3a2b9657b7
+DIST alpine-2.21.tar.gz 7478778 BLAKE2B f8b734ff8004f5509cd932f63127f2c328f4a236bcaaf032f817d90e90051c16be3f57546603550d2e6a3513d7759faba9e5ddddb04b252f2adfc9da8f5f3401 SHA512 e61bb498cf0b52acdaa88e930ef1bff5a2f09c4b0006c9d8224f634811ba3373ce2fc5b00b104caafe3a90f97bcca5f27e226fb82f5672c1837a201dcfff8d93
diff --git a/mail-client/alpine/alpine-2.21.1.ebuild b/mail-client/alpine/alpine-2.21.1.ebuild
new file mode 100644
index 000000000000..3c3ac27426b4
--- /dev/null
+++ b/mail-client/alpine/alpine-2.21.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs vcs-snapshot
+
+DESCRIPTION="alpine is an easy to use text-based based mail and news client"
+HOMEPAGE="http://www.washington.edu/alpine/ http://repo.or.cz/alpine.git/"
+GIT_COMMIT="672d6838a9babf2faeb9f79267525a4ab9d20b14"
+SRC_URI="http://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~alpha ~ia64 ~ppc ~sparc"
+IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
+
+DEPEND="virtual/pam
+	>=sys-libs/ncurses-5.1:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	ldap? ( net-nds/openldap )
+	kerberos? ( app-crypt/mit-krb5 )
+	spell? ( app-text/aspell )
+"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	!onlyalpine? ( !mail-client/pine )
+	!<=net-mail/uw-imap-2004g
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	myconf=(
+		--without-tcl
+		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
+		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
+	)
+
+	if use ssl; then
+		myconf+=(
+			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
+			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
+			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
+		)
+	fi
+	econf \
+		$(use_with ldap) \
+		$(use_with ssl) \
+		$(use_with passfile passfile .pinepwd) \
+		$(use_with kerberos krb5) \
+		$(use_with threads pthread) \
+		$(use_with spell interactive-spellcheck /usr/bin/aspell) \
+		$(use_enable nls) \
+		$(use_with ipv6) \
+		$(use_with smime) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	emake -j1 AR=$(tc-getAR)
+}
+
+src_install() {
+	if use onlyalpine ; then
+		dobin alpine/alpine
+		doman doc/alpine.1
+	else
+		emake DESTDIR="${D}" install
+		doman doc/man1/*.1
+	fi
+
+	dodoc NOTICE README*
+
+	if use doc ; then
+		dodoc doc/brochure.txt
+
+		docinto html/tech-notes
+		dodoc -r doc/tech-notes/*.html
+		dodoc -r doc/tech-notes/*.txt
+	fi
+}
diff --git a/mail-client/alpine/alpine-2.21.ebuild b/mail-client/alpine/alpine-2.21.ebuild
index 889913b3b1f8..c8f0db34c522 100644
--- a/mail-client/alpine/alpine-2.21.ebuild
+++ b/mail-client/alpine/alpine-2.21.ebuild
@@ -2,11 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools toolchain-funcs
+inherit autotools toolchain-funcs vcs-snapshot
 
 DESCRIPTION="alpine is an easy to use text-based based mail and news client"
-HOMEPAGE="http://www.washington.edu/alpine/ http://alpine.freeiz.com/alpine/ http://repo.or.cz/alpine.git/"
-SRC_URI="http://alpine.freeiz.com/alpine/release/src/${P}.tar.xz"
+HOMEPAGE="http://www.washington.edu/alpine/ http://repo.or.cz/alpine.git/"
+GIT_COMMIT="59678f8c7af17eb361f4b9cc9c30a26bff01a1f3"
+SRC_URI="http://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"