From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- mail-client/alpine/Manifest | 8 +- mail-client/alpine/alpine-2.21.1-r1.ebuild | 92 --------------------- mail-client/alpine/alpine-2.21.1-r2.ebuild | 95 ---------------------- mail-client/alpine/alpine-2.22-r1.ebuild | 93 +++++++++++++++++++++ mail-client/alpine/files/alpine-2.21.1-nopam.patch | 27 ------ mail-client/alpine/metadata.xml | 2 + 6 files changed, 98 insertions(+), 219 deletions(-) delete mode 100644 mail-client/alpine/alpine-2.21.1-r1.ebuild delete mode 100644 mail-client/alpine/alpine-2.21.1-r2.ebuild create mode 100644 mail-client/alpine/alpine-2.22-r1.ebuild delete mode 100644 mail-client/alpine/files/alpine-2.21.1-nopam.patch (limited to 'mail-client/alpine') diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest index 1b2d7f0ec629..bb2818ee35e1 100644 --- a/mail-client/alpine/Manifest +++ b/mail-client/alpine/Manifest @@ -1,8 +1,6 @@ -AUX alpine-2.21.1-nopam.patch 704 BLAKE2B 2a388b75246de1282686d3b229ea2841a930eeef3c9080303e544c9430c34546c179e8a4b0f6b700f3f532a10a203929047922c5ad6e918537011df5c9bd1cdd SHA512 4c5690a96137c303350ef515f3f382160b4045612df8c1ad63a7b72de040f13e33c8aa21e34858d8b33124c4f58dd7a19edcd40c8f49b95e9bbb0746973bcf46 AUX alpine-2.22-cc.patch 537 BLAKE2B 0f916be9bf91d8f9c347c9325d20a13e8ffdc462f050d0e7adc0f90b8371844bc615182a178fac145d95dfbe425c20e211606558e56158e2dc3723875df96c44 SHA512 ba694fc876b2ca32b0ff068e6153768fd117c0f9ea26d1fffb35a1640cd38882667d58c7678300917c17a23076e2a4cb0111992b4e42d07b22c2e328d69713e0 +DIST alpine-2.22-chappa.patch.gz 173232 BLAKE2B ac2cfc22119c9e60fdc053212447fb5df8cc59781c049329560d21e19e67d700fe45a07649352747583b500a605499eeb61dfd83ba150c3bd58f4033486e2581 SHA512 9db36ebb4fb2efaee975ed33d44cf95780c56075cbc0ad39056268248db38109e1bb04e279b40cdd085b3dfec89d0f9c69aa4ddf5a64b5708437909661288e23 DIST alpine-2.22.tar.xz 6336604 BLAKE2B 65cab2000b6c606c002efcca6e731d2c87329b4685dec81d202e95598b4302175137ea84f079af1f766a6ef99d0b2cb51132e12539bea7f4d24954bb48af7bea SHA512 7737dce02ac94170948df7fccb61380c6cb101190e37f5b3ba281d573f54df1db24569d177b460f49bfff381a922be2e4b0f3a0f1a213d88a64d361aedc3c4f1 -DIST alpine-843b2f1.tar.gz 7490140 BLAKE2B 13ac5ef43dd729a7cf21b44dcd6feace3e1813672aec537fd05d5ff90b67bec145ceef71cfcf35b0cb7e250bb307556f5dcf8ebb024bc6366fd0ace0a7c41161 SHA512 106caa7bfe86fd5e82554ba68b9ee579cd8495bcd0dfbf82d9d75da2df3bd292d42d67af8ec737091f2a820b2555c25bbf0058c9c7bb5de5f950b570ffc25c4d -EBUILD alpine-2.21.1-r1.ebuild 2237 BLAKE2B c02014289238b00a5ead8661e567bf1c3f7f9ca22f9a02553a04df3c21ee0eb983c6bc242ed19f33f91308a09d7699e6b8586b1c3bce2f841df10f5beb04f441 SHA512 270c1d9efc406fb547d5d2221791cb8e2112852b03f0e56b39833f5c4f2d97feb35f7709ff56903e01b96f22fc2cf93caa020f1615c3d9b929f4244ad74677a2 -EBUILD alpine-2.21.1-r2.ebuild 2218 BLAKE2B 4bcd38548dfec570422978a2b6ad3db07ad7f1738b066f03c8ea6fa265741971844dbf73a8630e2b5f70a88b00c305b77e985c1c8aa27bdcd984d142d27f7b86 SHA512 2a1d67cddee558988a19a16c2726101ebefc37b9f5287e45d4c7c8ea6d8f06ec862a37fb4806590b8b51d94fc30e0f6a6961fe88a768bf4ed7c867b618530ae9 +EBUILD alpine-2.22-r1.ebuild 2265 BLAKE2B ea1f4176eabe268c155e5914bb3a20cf743cd4c9507ed80c3863d58085228aea26d617979128135d3c534de5525fc5e72d23bca9bc699900cb3587121a2c7dea SHA512 182c3b98238b39bb3cfc7c5548d6192f4659468f972fc9d8234dc9cc088388397f848c2024360e279e5c529278f1e938feb5cd934edd280d0794af008933ec88 EBUILD alpine-2.22.ebuild 2060 BLAKE2B 5f58202d66033d9417c2d9eec597e2cef12c04c7d7953490fd680782d2a843afdea6791bbe2a2cb265ccff3934c55221f5495b7c656289874b64f6fd83fb78ce SHA512 6685cbdb825260de2da09d8a23c06be390235346aa93d411cdabe9741dff45c10399b4693baa3bd30355591de59b7dfc77e5e847924d5f24ae226645569d5301 -MISC metadata.xml 647 BLAKE2B 4086af8d509f84060de872fb72550c418d9b73883474ee873192540e0e05a2cc0fb9792c727137edcc08c3d16ed0af7964d5dc5dd82a58adcc85198e9862453c SHA512 d4a2cb5a4519c12cb75441e7418c34d96b320281d503f9ff2ce94050a88e2d5ac476ccb46c325ca35d459c0bf1c56932755cb7b919d27ea253c13f4b40d035ce +MISC metadata.xml 731 BLAKE2B 299d44541ef09d51036feeb36ca1d720fba218c526cbb34d7d7358f8baa8d227ee96f823a1960a3fe16313da57f3ea2cd83424d5228839d722a94f780680949e SHA512 fb53b04da391da15373da8dff24b64abd9bee04a24eea999f1331d175c2084d9267c056426b5a9d7cebec808002715782bc1d414a70c310ddbbad72c0540dbae diff --git a/mail-client/alpine/alpine-2.21.1-r1.ebuild b/mail-client/alpine/alpine-2.21.1-r1.ebuild deleted file mode 100644 index 9f6b2e62ced2..000000000000 --- a/mail-client/alpine/alpine-2.21.1-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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/" -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 passfile smime spell ssl threads" - -DEPEND="sys-libs/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 -} diff --git a/mail-client/alpine/alpine-2.21.1-r2.ebuild b/mail-client/alpine/alpine-2.21.1-r2.ebuild deleted file mode 100644 index 4cec97ed419d..000000000000 --- a/mail-client/alpine/alpine-2.21.1-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2020 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/" -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/alpine-2.22-r1.ebuild b/mail-client/alpine/alpine-2.22-r1.ebuild new file mode 100644 index 000000000000..2d77170f9850 --- /dev/null +++ b/mail-client/alpine/alpine-2.22-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2020 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 ~sparc ~x86" +IUSE="+chappa doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads" + +DEPEND=">=sys-libs/ncurses-5.1:0= + kerberos? ( app-crypt/mit-krb5 ) + ldap? ( net-nds/openldap ) + spell? ( app-text/aspell ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) +" +RDEPEND="${DEPEND} + app-misc/mime-types +" + +PATCHES=( + "${FILESDIR}/${P}-cc.patch" +) + +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/files/alpine-2.21.1-nopam.patch b/mail-client/alpine/files/alpine-2.21.1-nopam.patch deleted file mode 100644 index 1552f440b536..000000000000 --- a/mail-client/alpine/files/alpine-2.21.1-nopam.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ./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 - ;; diff --git a/mail-client/alpine/metadata.xml b/mail-client/alpine/metadata.xml index 155fe030ffa0..f37867c6e471 100644 --- a/mail-client/alpine/metadata.xml +++ b/mail-client/alpine/metadata.xml @@ -10,6 +10,8 @@ Proxy Maintainers + enhance Alpine by applying Eduardo Chappa's + patches installs only the alpine binary, so it does not collied with pico and/or pine Adds support for caching passwords into a file -- cgit v1.2.3