From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1120802-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 73864138334
	for <garchives@archives.gentoo.org>; Thu,  7 Nov 2019 05:43:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 3E122E08F7;
	Thu,  7 Nov 2019 05:43:02 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 182A2E08F7
	for <gentoo-commits@lists.gentoo.org>; Thu,  7 Nov 2019 05:43:02 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 6605434C9F3
	for <gentoo-commits@lists.gentoo.org>; Thu,  7 Nov 2019 05:43:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id E406D88E
	for <gentoo-commits@lists.gentoo.org>; Thu,  7 Nov 2019 05:42:58 +0000 (UTC)
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" <juippis@gentoo.org>
Message-ID: <1573105349.cdc9317f37aedfaf956f7f72ef46f73b97f31170.juippis@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/alpine/, mail-client/alpine/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: mail-client/alpine/alpine-2.21.1-r2.ebuild mail-client/alpine/files/alpine-2.21.1-nopam.patch
X-VCS-Directories: mail-client/alpine/ mail-client/alpine/files/
X-VCS-Committer: juippis
X-VCS-Committer-Name: Joonas Niilola
X-VCS-Revision: cdc9317f37aedfaf956f7f72ef46f73b97f31170
X-VCS-Branch: master
Date: Thu,  7 Nov 2019 05:42:58 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6dc892dd-3ae5-4631-b263-c46157576c41
X-Archives-Hash: bdaf98b56e651eb7d7f801445be76f32

commit:     cdc9317f37aedfaf956f7f72ef46f73b97f31170
Author:     Robert Siebeck <gentoo.2019 <AT> r123 <DOT> de>
AuthorDate: Sat Nov 17 18:27:32 2018 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 05:42:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc9317f

mail-client/alpine: make PAM optional

Closes: https://bugs.gentoo.org/617924

Signed-off-by: Robert Siebeck <gentoo.bugzilla.2012 <AT> r123.de>
Closes: https://github.com/gentoo/gentoo/pull/10645
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 mail-client/alpine/alpine-2.21.1-r2.ebuild         | 95 ++++++++++++++++++++++
 mail-client/alpine/files/alpine-2.21.1-nopam.patch | 27 ++++++
 2 files changed, 122 insertions(+)

diff --git a/mail-client/alpine/alpine-2.21.1-r2.ebuild b/mail-client/alpine/alpine-2.21.1-r2.ebuild
new file mode 100644
index 00000000000..cd416868590
--- /dev/null
+++ b/mail-client/alpine/alpine-2.21.1-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="An easy to use text-based based mail and news client"
+HOMEPAGE="https://www.washington.edu/alpine/ https://repo.or.cz/alpine.git/"
+GIT_COMMIT="843b2f16abfd949e09b1c5465387b1b0f724994a"
+MY_P="${PN}-${GIT_COMMIT::7}"
+SRC_URI="https://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine pam passfile smime spell ssl threads"
+
+DEPEND=">=sys-libs/ncurses-5.1:0=
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	spell? ( app-text/aspell )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+"
+
+HTML_DOCS=("doc/tech-notes/")
+
+PATCHES=(
+	"${FILESDIR}/${P}-nopam.patch"
+)
+
+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
+		$(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)
+		$(use_with pam)
+	)
+
+	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 "${myconf[@]}"
+}
+
+src_compile() {
+	emake -j1 AR=$(tc-getAR)
+}
+
+src_install() {
+	if use onlyalpine ; then
+		dobin alpine/alpine
+		doman doc/man1/alpine.1
+	else
+		emake -j1 DESTDIR="${D}" install
+		doman doc/man1/*.1
+	fi
+
+	dodoc NOTICE README*
+
+	if use doc ; then
+		dodoc doc/brochure.txt
+
+		dodoc doc/tech-notes/tech-notes.txt
+		newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample
+		newdoc "${S}/doc/mime.types" mime.types.sample
+		docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
+	fi
+}

diff --git a/mail-client/alpine/files/alpine-2.21.1-nopam.patch b/mail-client/alpine/files/alpine-2.21.1-nopam.patch
new file mode 100644
index 00000000000..1552f440b53
--- /dev/null
+++ b/mail-client/alpine/files/alpine-2.21.1-nopam.patch
@@ -0,0 +1,27 @@
+--- ./configure.ac	2019-11-04 20:09:50.094172283 +0100
++++ ./configure.ac	2019-11-04 20:59:33.775007247 +0100
+@@ -257,6 +257,7 @@
+   alpine_c_client_gccoptlevel="-O0"
+   AC_MSG_RESULT([no])
+ fi
++AC_ARG_WITH([pam], AS_HELP_STRING([--without-pam], [Build without PAM support]))
+ 
+ dnl disable mouse support
+ AC_MSG_CHECKING([option: mouse support enabled])
+@@ -1108,7 +1109,7 @@
+       alpine_PAM="yes"
+     else
+       systype="LNX"
+-      AC_CHECK_LIB(pam, pam_start,
++      AS_IF(test "x$with_pam" != "xno",
+         [
+           alpine_c_client_target="lnp"
+ 	  alpine_PAM="yes"
+@@ -1119,6 +1120,7 @@
+ 	  else
+ 	    alpine_c_client_target="lnx"
+ 	  fi
++	  alpine_PAM="none"
+         ])
+     fi
+     ;;