From c3bbef528b501c7e3bb5d58a6f74a8167ae4f8d1 Mon Sep 17 00:00:00 2001 From: Anna Vyalkova Date: Sun, 15 Jan 2023 08:29:38 +0200 Subject: net-nntp/tin: drop libpcre support in 2.6.2 Signed-off-by: Anna Vyalkova Signed-off-by: Joonas Niilola --- net-nntp/tin/metadata.xml | 1 - net-nntp/tin/tin-2.6.2-r1.ebuild | 115 ++++++++++++++++++++++++++++++++++++++ net-nntp/tin/tin-2.6.2.ebuild | 116 --------------------------------------- 3 files changed, 115 insertions(+), 117 deletions(-) create mode 100644 net-nntp/tin/tin-2.6.2-r1.ebuild delete mode 100644 net-nntp/tin/tin-2.6.2.ebuild diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml index 2273dcd0ef5a..99b4b39ce6a7 100644 --- a/net-nntp/tin/metadata.xml +++ b/net-nntp/tin/metadata.xml @@ -9,6 +9,5 @@ Enable Cancel-Lock header functionality Enable app-crypt/gnupg support Prefer dev-libs/libretls as SSL/TLS provider (ineffective with USE=-ssl) - Use dev-libs/libpcre2 instead of dev-libs/libpcre diff --git a/net-nntp/tin/tin-2.6.2-r1.ebuild b/net-nntp/tin/tin-2.6.2-r1.ebuild new file mode 100644 index 000000000000..b5e39382f92c --- /dev/null +++ b/net-nntp/tin/tin-2.6.2-r1.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature toolchain-funcs + +DESCRIPTION="A threaded NNTP and spool based UseNet newsreader" +HOMEPAGE="http://www.tin.org/" +SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="cancel-locks debug gnutls gpg libtls nls sasl socks5 ssl" + +RDEPEND=" + dev-libs/icu:= + dev-libs/libpcre2:= + dev-libs/uulib + sys-libs/ncurses:= + virtual/libiconv + cancel-locks? ( >=net-libs/canlock-3.0:= ) + gpg? ( app-crypt/gnupg ) + nls? ( virtual/libintl ) + sasl? ( virtual/gsasl ) + socks5? ( net-proxy/dante ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + libtls? ( dev-libs/libretls:= ) + !libtls? ( dev-libs/openssl:= ) + ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/yacc + dev-libs/libpcre2 + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( "${FILESDIR}"/${P}-gnutls.patch ) + +DOCS=( + README{,.MAC,.WIN} + doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,filtering} +) + +src_configure() { + tc-export AR CC RANLIB + tc-export_build_env + + local myeconfargs=( + $(use_enable cancel-locks) + $(use_with cancel-locks canlock) + + $(use_enable debug) + $(use_enable gpg pgp-gpg) + $(use_enable nls) + $(use_with socks5 socks) + --disable-mime-strict-charset + --enable-nntp + --enable-prototypes + --without-pcre + --with-pcre2-config + --with-coffee # easter egg :) + --with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}" + --with-screen=ncursesw + ) + + if use ssl; then + if use gnutls; then + myeconfargs+=( --with-nntps=gnutls ) + elif use libtls; then + myeconfargs+=( --with-nntps=libtls ) + else + myeconfargs+=( --with-nntps=openssl ) + fi + fi + + myeconfargs+=( + # set default paths for utilities + --with-editor="${EPREFIX}"/usr/libexec/editor + --with-gpg="${EPREFIX}"/usr/bin/gpg + --with-ispell="${EPREFIX}"/usr/bin/aspell + --with-mailer="${EPREFIX}"/bin/mail + --with-sum="${EPREFIX}"/usr/bin/sum + + # set default paths for directories + --with-libdir="${EPREFIX}"/var/lib/news + --with-spooldir="${EPREFIX}"/var/spool/news + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + # To build from the root dir you have to call `make build`, not just `make`. + emake build +} + +src_install() { + default + + emake DESTDIR="${D}" install_sysdefs + emake -C src DESTDIR="${D}" install_nls_man + + dodoc doc/{*.sample,*.txt} +} + +pkg_postinst() { + optfeature "spell checker support" app-text/aspell +} diff --git a/net-nntp/tin/tin-2.6.2.ebuild b/net-nntp/tin/tin-2.6.2.ebuild deleted file mode 100644 index 50345f36be9e..000000000000 --- a/net-nntp/tin/tin-2.6.2.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit optfeature toolchain-funcs - -DESCRIPTION="A threaded NNTP and spool based UseNet newsreader" -HOMEPAGE="http://www.tin.org/" -SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="cancel-locks debug gnutls gpg libtls nls +pcre2 sasl socks5 ssl" - -RDEPEND=" - dev-libs/icu:= - dev-libs/uulib - sys-libs/ncurses:= - virtual/libiconv - cancel-locks? ( >=net-libs/canlock-3.0:= ) - gpg? ( app-crypt/gnupg ) - nls? ( virtual/libintl ) - pcre2? ( dev-libs/libpcre2:= ) - !pcre2? ( dev-libs/libpcre:3 ) - sasl? ( virtual/gsasl ) - socks5? ( net-proxy/dante ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - libtls? ( dev-libs/libretls:= ) - !libtls? ( dev-libs/openssl:= ) - ) - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-alternatives/yacc - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -PATCHES=( "${FILESDIR}"/${P}-gnutls.patch ) - -DOCS=( - README{,.MAC,.WIN} - doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW,filtering} -) - -src_configure() { - tc-export AR CC RANLIB - tc-export_build_env - - local myeconfargs=( - $(use_enable cancel-locks) - $(use_with cancel-locks canlock) - - $(use_with pcre2 pcre2-config) - $(use_with !pcre2 pcre "${ESYSROOT}"/usr) - - $(use_enable debug) - $(use_enable gpg pgp-gpg) - $(use_enable nls) - $(use_with socks5 socks) - --disable-mime-strict-charset - --enable-nntp - --enable-prototypes - --with-coffee # easter egg :) - --with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}" - --with-screen=ncursesw - ) - - if use ssl; then - if use gnutls; then - myeconfargs+=( --with-nntps=gnutls ) - elif use libtls; then - myeconfargs+=( --with-nntps=libtls ) - else - myeconfargs+=( --with-nntps=openssl ) - fi - fi - - myeconfargs+=( - # set default paths for utilities - --with-editor="${EPREFIX}"/usr/libexec/editor - --with-gpg="${EPREFIX}"/usr/bin/gpg - --with-ispell="${EPREFIX}"/usr/bin/aspell - --with-mailer="${EPREFIX}"/bin/mail - --with-sum="${EPREFIX}"/usr/bin/sum - - # set default paths for directories - --with-libdir="${EPREFIX}"/var/lib/news - --with-spooldir="${EPREFIX}"/var/spool/news - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - # To build from the root dir you have to call `make build`, not just `make`. - emake build -} - -src_install() { - default - - emake DESTDIR="${D}" install_sysdefs - emake -C src DESTDIR="${D}" install_nls_man - - dodoc doc/{*.sample,*.txt} -} - -pkg_postinst() { - optfeature "spell checker support" app-text/aspell -} -- cgit v1.2.3-65-gdbad