From d6a3288a9d4f102452b36ece1b271590ba2ebeaf Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Sun, 16 Oct 2016 09:57:34 +0200 Subject: Remove automagic pam detection --- mail-client/alpine/alpine-2.00-r6.ebuild | 120 ------------------------------ mail-client/alpine/alpine-2.00-r7.ebuild | 122 +++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 120 deletions(-) delete mode 100644 mail-client/alpine/alpine-2.00-r6.ebuild create mode 100644 mail-client/alpine/alpine-2.00-r7.ebuild (limited to 'mail-client') diff --git a/mail-client/alpine/alpine-2.00-r6.ebuild b/mail-client/alpine/alpine-2.00-r6.ebuild deleted file mode 100644 index 7726b4a5..00000000 --- a/mail-client/alpine/alpine-2.00-r6.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic autotools toolchain-funcs - -CHAPPA_PL=115 -DESCRIPTION="alpine is an easy to use text-based based mail and news client" -HOMEPAGE="http://www.washington.edu/alpine/ http://patches.freeiz.com/alpine/" -SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2 - chappa? ( http://patches.freeiz.com/alpine/patches/alpine-2.00/all.patch.gz - -> ${P}-chappa-${CHAPPA_PL}-all.patch.gz )" - -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 topal +chappa" - -DEPEND="pam? ( virtual/pam ) - >=net-libs/c-client-2007f-r4[topal=,chappa=] - sys-libs/ncurses:0= - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - ldap? ( net-nds/openldap ) - kerberos? ( app-crypt/mit-krb5 ) - spell? ( app-text/aspell ) - topal? ( >=net-mail/topal-72 )" -RDEPEND="${DEPEND} - app-misc/mime-types - !onlyalpine? ( !mail-client/pine ) - !<=net-mail/uw-imap-2004g" - -pkg_unpack() { - default - unpack "${DISTDIR}/${P}-chappa-${CHAPPA_PL}-all.patch.gz" -} - -pkg_setup() { - if use smime && use topal ; then - ewarn "You can not have USE='smime topal'. Assuming topal is more important." - fi -} - -src_prepare() { - use chappa && eapply "${WORKDIR}/${P}-chappa-${CHAPPA_PL}-all.patch" - use topal && eapply /usr/share/topal/patches/"${P}".patch-{1,2} - - # do not use the bundled c-client - ebegin "Unbundling the c-client library" - rm -rf "${S}"/imap - local f - while read f ; do - sed -i -e \ - 's~^#include[[:blank:]]".*/c-client/\(.*\)"~#include ~g' "$f" - done < <(find "${S}" -name "*.c" -o -name "*.h") - eend $? - - ! use pam || eapply "${FILESDIR}"/2.00-lpam.patch - eapply "${FILESDIR}"/2.00-lcrypto.patch - eapply -p0 "${FILESDIR}"/2.00-c-client.patch - eapply -p0 "${FILESDIR}"/2.00-qa.patch - use chappa && eapply -p0 "${FILESDIR}/2.00-qa-chappa-${CHAPPA_PL}.patch" - - eapply_user - eautoreconf -} - -src_configure() { - local myconf="--without-tcl - --with-system-pinerc=/etc/pine.conf - --with-system-fixed-pinerc=/etc/pine.conf.fixed" - #--disable-debug" - # fixme - # --with-system-mail-directory=DIR? - - if use ssl; then - myconf+=" --with-ssl - --with-ssl-include-dir=/usr - --with-ssl-lib-dir=/usr/$(get_libdir) - --with-ssl-certs-dir=/etc/ssl/certs" - else - myconf+="--without-ssl" - fi - econf \ - $(use_with ldap) \ - $(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 topal || use_with smime) \ - ${myconf} -} - -src_compile() { - emake AR=$(tc-getAR) -} - -src_install() { - if use onlyalpine ; then - dobin alpine/alpine - doman doc/alpine.1 - else - emake DESTDIR="${D}" install - doman doc/rpdump.1 doc/rpload.1 - fi - - dodoc NOTICE README* - - if use doc ; then - dodoc doc/brochure.txt doc/tech-notes.txt - - docinto html/tech-notes - dodoc -r doc/tech-notes/ - fi -} diff --git a/mail-client/alpine/alpine-2.00-r7.ebuild b/mail-client/alpine/alpine-2.00-r7.ebuild new file mode 100644 index 00000000..fc732c96 --- /dev/null +++ b/mail-client/alpine/alpine-2.00-r7.ebuild @@ -0,0 +1,122 @@ +# Copyright 2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic autotools toolchain-funcs + +CHAPPA_PL=115 +DESCRIPTION="alpine is an easy to use text-based based mail and news client" +HOMEPAGE="http://www.washington.edu/alpine/ http://patches.freeiz.com/alpine/" +SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2 + chappa? ( http://patches.freeiz.com/alpine/patches/alpine-2.00/all.patch.gz + -> ${P}-chappa-${CHAPPA_PL}-all.patch.gz )" + +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 topal +chappa" + +DEPEND="pam? ( virtual/pam ) + >=net-libs/c-client-2007f-r4[topal=,chappa=] + sys-libs/ncurses:0= + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + ldap? ( net-nds/openldap ) + kerberos? ( app-crypt/mit-krb5 ) + spell? ( app-text/aspell ) + topal? ( >=net-mail/topal-72 )" +RDEPEND="${DEPEND} + app-misc/mime-types + !onlyalpine? ( !mail-client/pine ) + !<=net-mail/uw-imap-2004g" + +pkg_unpack() { + default + unpack "${DISTDIR}/${P}-chappa-${CHAPPA_PL}-all.patch.gz" +} + +pkg_setup() { + if use smime && use topal ; then + ewarn "You can not have USE='smime topal'. Assuming topal is more important." + fi +} + +src_prepare() { + use chappa && eapply "${WORKDIR}/${P}-chappa-${CHAPPA_PL}-all.patch" + use topal && eapply /usr/share/topal/patches/"${P}".patch-{1,2} + + # do not use the bundled c-client + ebegin "Unbundling the c-client library" + rm -rf "${S}"/imap + local f + while read f ; do + sed -i -e \ + 's~^#include[[:blank:]]".*/c-client/\(.*\)"~#include ~g' "$f" + done < <(find "${S}" -name "*.c" -o -name "*.h") + eend $? + + ! use pam || eapply "${FILESDIR}"/2.00-lpam.patch + sed -ie 's/AC_CHECK_LIB[^(]*([^,]*pam[^,]*,[^,]*,/AS_IF(['$( + usex pam true false)'],/' -- "${S}"/configure.ac + eapply "${FILESDIR}"/2.00-lcrypto.patch + eapply -p0 "${FILESDIR}"/2.00-c-client.patch + eapply -p0 "${FILESDIR}"/2.00-qa.patch + use chappa && eapply -p0 "${FILESDIR}/2.00-qa-chappa-${CHAPPA_PL}.patch" + + eapply_user + eautoreconf +} + +src_configure() { + local myconf="--without-tcl + --with-system-pinerc=/etc/pine.conf + --with-system-fixed-pinerc=/etc/pine.conf.fixed" + #--disable-debug" + # fixme + # --with-system-mail-directory=DIR? + + if use ssl; then + myconf+=" --with-ssl + --with-ssl-include-dir=/usr + --with-ssl-lib-dir=/usr/$(get_libdir) + --with-ssl-certs-dir=/etc/ssl/certs" + else + myconf+="--without-ssl" + fi + econf \ + $(use_with ldap) \ + $(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 topal || use_with smime) \ + ${myconf} +} + +src_compile() { + emake AR=$(tc-getAR) +} + +src_install() { + if use onlyalpine ; then + dobin alpine/alpine + doman doc/alpine.1 + else + emake DESTDIR="${D}" install + doman doc/rpdump.1 doc/rpload.1 + fi + + dodoc NOTICE README* + + if use doc ; then + dodoc doc/brochure.txt doc/tech-notes.txt + + docinto html/tech-notes + dodoc -r doc/tech-notes/ + fi +} -- cgit v1.2.3-65-gdbad