gentoo resync : 05.12.2021

3 files changed, 2 insertions, 92 deletions

diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 4765beea1152..818c0481cedb 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,8 +1,5 @@
-DIST alpine-2.24-chappa.patch.gz 172010 BLAKE2B 39f5336ead355a4b78bcdd5b44dc398888bf93f3c3efa95b3ad8a86f3a0dda13f03164a03fbed898150864130648a204a6b5d9e32c3437138878516d014c8bbe SHA512 7152a8e4a79a530345448267204a96bc2585b4fccb23f011fd4dc97bc713696b8eb7ca9563655d8da33570ef14bf29577f82fe0f104c80590a43b0e74ec89e81
-DIST alpine-2.24.tar.xz 7341676 BLAKE2B 63e2d9387f1a369f9a4623625524f25eec64c600672092608256fd2827c094fae1384b35da84ec5f5865295744982ede533551dc47b6f0c80f2405ed16cad546 SHA512 642a51f73732ebdf7c40e2b66370aa2f48fb13b349b477871b26295c3e8b860a0cc78dec9f80efc6ea74c548a080ceff04181eb18c35a9c8cae8d8ef831178c5
 DIST alpine-2.25-chappa.patch.gz 172963 BLAKE2B 5e306325beb46fd2f716620794894f563b93e116693a1af050ea5f61c203350d2aa72b67d7f66acc748caea6a73bdef85f45324eb01edf8a6035b07f8a50e2bb SHA512 b88ca58e42a72b2b92cf28e4cae492a5ee75d534821046645fcc358833e87287fc707d5bec5c3508942a0ef1ecffe64916f00f1a01e430048384838e5ca40358
 DIST alpine-2.25-ssl.patch 5431 BLAKE2B 0cf2fcb682fbee41aa988ff089c16b75ebd9bee321c1c130d0b5136e5ca521bded7e9a97cd3ade1c86b17e72136264d4405cc36427a347c9bee84ee8a64548d4 SHA512 698d2a3c3b7b588fe3fcfe0291f0aab05c42b5ea80de1f210c1985082651329b80447de4e8057bc7e962fe8ed5175ea8132bad413c02fb1f0cc67c84e9420642
 DIST alpine-2.25.tar.xz 7495372 BLAKE2B ce2587a309c87ba527d51c360ee0d9627453cce6585631f569eb26db04aa6c5cddb7c9599478092447a040c43e9234e78a942fef4b1186d07c608163f96236be SHA512 76c214cf66f4ac7af3de40357ad3a592ff2a119e327e5f6c256125b7865d46b09197435fe6ac8077ab7a498e4821925939f3f902431ca77baa786e149466a193
-EBUILD alpine-2.24-r1.ebuild 2176 BLAKE2B 6fca43a26daa89d8b7d57990c09c2ca50fe49eac66c50fb095abfe26beaeefa6d3d14946c5e622cb4e4a173cf3a3830fb8a2bdff0fd70982a1d6f848734ba128 SHA512 9c0bffd2db7029e4516219bc6d8a0fb07be074e5b21a6cd3da5192845fa76b4dd0273bcba9622d2472b8d92cf0d654a47251215cfdd86542474239712ca8c999
-EBUILD alpine-2.25.ebuild 2411 BLAKE2B ef36452e59caeae479cdbc64c69102f3d316e5c47633586544cfa00edf755d4ff72600d1fce614f490bd2aa80d7978221715b86ff55b5a5bf22e493508d614b4 SHA512 d0baebb5678516ea6546fc79f92d096f14c7520da0cc57259cfa4c49bbbd53842f970f7631d58db826c26ebd87a8fcf0d46a4180b9acd10f7fc1cbf5547899c7
+EBUILD alpine-2.25.ebuild 2408 BLAKE2B 5e32ac32c617667b787eadaa3834ae53e35bcfb6df2b267757b5a60fd5cbf28c2d0c8b1907f9cd3ac5cafeb93482177e54bf75812dce777445ec45b0cc06be3b SHA512 03bee6d4314609b7a7828dbb0a68621545caea14fdfa7da68136c17a229099e8aa86f267cbb576fdf0ee0c19d24b800a23e2937ca01919537786f32a9381a2fe
 MISC metadata.xml 762 BLAKE2B 026faecac5042e19cce6f125f66fd7af22cbd50140abe315a686d1b129f53b939f5325f9bd1956d41b47da146b6f37c597fe91370722f2f4c7af8169cbcb0f66 SHA512 e11cb2d6c0612fc09302485c38d216245adcabde36fb2c6e829b452f10f3adc9037f1461305e2e3cc3e89025560ac3d621b90b94eea152c9c3e0c53a6c6f9512
diff --git a/mail-client/alpine/alpine-2.24-r1.ebuild b/mail-client/alpine/alpine-2.24-r1.ebuild
deleted file mode 100644
index 16d284d558d8..000000000000
--- a/mail-client/alpine/alpine-2.24-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 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="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
-CHAPPA_PATCH_NAME="${P}-chappa.patch"
-SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
-	chappa? ( http://alpine.x10host.com/alpine/patches/${P}/all.patch.gz -> ${CHAPPA_PATCH_NAME}.gz ) "
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="+chappa doc ipv6 kerberos ldap nls onlyalpine passfile smime spell ssl threads"
-
-DEPEND="sys-libs/ncurses:=
-	virtual/libcrypt:=
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	spell? ( app-text/aspell )
-	ssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-"
-
-src_prepare() {
-	default
-	use chappa && eapply "${WORKDIR}/${CHAPPA_PATCH_NAME}"
-	eautoreconf
-	tc-export CC RANLIB AR
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-}
-
-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)
-	)
-
-	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 -r doc/tech-notes/
-		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/alpine-2.25.ebuild b/mail-client/alpine/alpine-2.25.ebuild
index 7d853c64fc2a..3beb218d42eb 100644
--- a/mail-client/alpine/alpine-2.25.ebuild
+++ b/mail-client/alpine/alpine-2.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="+chappa ipv6 kerberos ldap nls onlyalpine passfile smime spell ssl threads"
 
 # alpine-2.25-ssl.patch can only be applied when not using the chappa patches.