gentoo resync : 15.09.2018

3 files changed, 94 insertions, 2 deletions

diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index f36376d22353..eb68791b0565 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -6,6 +6,7 @@ AUX 2.00-qa.patch 409 BLAKE2B 2d74c9835079a8b62721f58d21c10071b69d9c3821ad5ecaa5
 DIST alpine-2.00-chappa-115-all.patch.gz 212705 BLAKE2B 99c21a7b74a4ea04c3bb54947868b31f0e65eef0e35e515d14d9a701e5809fa1a7191444a353de3ba08b821bdf71543faaf261d4a427c2d1e366bbc00d4bf337 SHA512 5e9fcb6a80dbd18bed26109caa6b7aa5eeb88de420861d9998c32f031e8279d6367c28b6670fb54203d1b14c3dc47cf5ad25b42e4949157de64f3f1fd36d0aa7
 DIST alpine-2.00.tar.bz2 5222673 BLAKE2B 38a9cd1fe3e291119b889bca0d304333cdf9ad8c63bc7923ea0735d3528c933b7d4dfe70bb353fe7b6047dafdaee3218a35e561f542b6ac763b60cb986509371 SHA512 17c6e65fbe767d4f9ffb3d3c2bb3deeab9d3620cd046cbb0009290aa484c9254effa992957631f0603bd82b82aeca2923d391aee6d20a7684d5830fbca8ce4d2
 DIST alpine-2.21.1.tar.gz 7490699 BLAKE2B f3aeafb55697701f6edda43659c9d27c7d7dab74f8e332e867f354ce555c26037f4b642af80f18db249dd7269f80bd880bc315ba4ae08ae7f63abc7998cea073 SHA512 78b47bd9e9dfc652bc407fe736d8b7526625782c332803cf01e5214a2b0a5af21736b8a2e685348913f6e2b10c80dced12081202294e9c61e3168b3a2b9657b7
-EBUILD alpine-2.00-r7.ebuild 2683 BLAKE2B 8bdfd80a2561ce22fc8aa7a8fc63c1ef40f3bfd7bec025c3a19fca835963541a67a6f0fa64a54ea00624ed0d92b0a53e4ff0c040ea3786e48b7e6e63428698f9 SHA512 11901edf7ac5c494a1ad48a5f00d512b90b017f00413baef3682ebb2f33072fbd64c6fc3b2319df406bfa4b376534071ef25f07ecf41227e788fa62146e3b049
+EBUILD alpine-2.00-r7.ebuild 2684 BLAKE2B 594c7069474bac9f97bf5038c3d5a3a0fd3fe1eedef1062f80a46d4ec006b0a4e95b5450ac37ce43abf60e56c191f0b670cb72e8d212e8cc9099a834275f94dd SHA512 2af02575f7cfede96b434e3a5563e283b8aef8ffdb7d045089ad7ad86c0e51d6be05a03bbf98b8ad1906f552d618aa2acd183a7b80ec7c5d192e21ea2d3b7472
+EBUILD alpine-2.21.1-r1.ebuild 2206 BLAKE2B 06d13526b9f5dfd0ae4140b4549d7b8e12ea5a2d961af155fade096b8c7b702705230290642ba4812dca100d014459510c7995d9cbe1110384a1a466575a4bfc SHA512 d771105d9a43ec2756b64e0e4300a66fbbc6177f0f219fe1fa1123e95c50615cc7a5f6abc66f0cbf29a186ea51d4ee2df725ffc18bfddf88f7944dbb82245cd9
 EBUILD alpine-2.21.1.ebuild 1996 BLAKE2B 27e5c9baa52016fd349fc56c8593fe8d7be104f24e053be21518d404310f62b397fe01d3f6187f724dc32296a4e8d9e0a4bf3705920a8a9e5d894adb36e01d46 SHA512 cf7346f4db6a1392b3a61d12d2aac4a8c58e6e995bcaa91851af805b1dec87fd7df786edeec39b0559c96cab1d896aa13a312e74d24d26503242a144d46e94a0
 MISC metadata.xml 845 BLAKE2B 1a7529f7bbcb5464d3ea41f8fe9afdacf8ebe099a0cd109f8e4826a4538d7f2025477b0a817eff7e4c02096ad0d2083155e589ef143ef3fd7661909504ea97b8 SHA512 bd16db341dbade41763360c32ebf2d4a33111eb3b41ce43e2619c1fb184d15e9351d518316a603517e28a293f8de22308d6a6aa5f1b0c82adcb67837a3bd5773
diff --git a/mail-client/alpine/alpine-2.00-r7.ebuild b/mail-client/alpine/alpine-2.00-r7.ebuild
index 1d84f4e87279..f9fe604f1b25 100644
--- a/mail-client/alpine/alpine-2.00-r7.ebuild
+++ b/mail-client/alpine/alpine-2.00-r7.ebuild
@@ -8,7 +8,7 @@ CHAPPA_PL=115
 DESCRIPTION="An easy to use text-based based mail and news client"
 HOMEPAGE="http://www.washington.edu/alpine/ http://alpine.freeiz.com/alpine/"
 SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
-	chappa? ( http://alpine.freeiz.com/alpine/patches/${P}/all.patch.gz
+	chappa? ( http://alpine.x10host.com/alpine/patches/${P}/all.patch.gz
 	-> ${P}-chappa-${CHAPPA_PL}-all.patch.gz )"
 
 LICENSE="Apache-2.0"
diff --git a/mail-client/alpine/alpine-2.21.1-r1.ebuild b/mail-client/alpine/alpine-2.21.1-r1.ebuild
new file mode 100644
index 000000000000..a02a0c5018b8
--- /dev/null
+++ b/mail-client/alpine/alpine-2.21.1-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs vcs-snapshot
+
+DESCRIPTION="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="843b2f16abfd949e09b1c5465387b1b0f724994a"
+SRC_URI="http://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+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 AR=$(tc-getAR)
+}
+
+src_install() {
+	if use onlyalpine ; then
+		dobin alpine/alpine
+		doman doc/man1/alpine.1
+	else
+		emake 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
+		docinto html/tech-notes
+		dohtml -r doc/tech-notes/
+		docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
+	fi
+}