From d3900d43cd935b7c9c6904ae68dcbcab60eb1cf3 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 22 Feb 2023 16:29:47 +0000 Subject: www-client/lynx: fix libidn2 automagic dep As Hanno points out, the build system already prefers libidn2 > libidn if libidn2 is installed. Closes: https://bugs.gentoo.org/895902 Signed-off-by: Sam James --- www-client/lynx/lynx-2.9.0_pre12-r1.ebuild | 108 +++++++++++++++++++++++++++++ www-client/lynx/lynx-2.9.0_pre12.ebuild | 108 ----------------------------- 2 files changed, 108 insertions(+), 108 deletions(-) create mode 100644 www-client/lynx/lynx-2.9.0_pre12-r1.ebuild delete mode 100644 www-client/lynx/lynx-2.9.0_pre12.ebuild (limited to 'www-client') diff --git a/www-client/lynx/lynx-2.9.0_pre12-r1.ebuild b/www-client/lynx/lynx-2.9.0_pre12-r1.ebuild new file mode 100644 index 000000000000..70e6f03f4281 --- /dev/null +++ b/www-client/lynx/lynx-2.9.0_pre12-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc +inherit verify-sig + +case ${PV} in + *_pre*) MY_P="${PN}${PV/_pre/dev.}" ;; + *_rc*) MY_P="${PN}${PV/_rc/pre.}" ;; + *_p*|*) MY_P="${PN}${PV/_p/rel.}" ;; +esac + +DESCRIPTION="An excellent console-based web browser with ssl support" +HOMEPAGE="https://lynx.invisible-island.net/" +SRC_URI="https://invisible-mirror.net/archives/${PN}/tarballs/${MY_P}.tar.bz2" +SRC_URI+=" verify-sig? ( https://invisible-mirror.net/archives/${PN}/tarballs/${MY_P}.tar.bz2.asc )" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="brotli bzip2 cjk gnutls idn nls ssl" + +RDEPEND=" + sys-libs/ncurses:=[unicode(+)] + sys-libs/zlib + brotli? ( app-arch/brotli:= ) + bzip2? ( app-arch/bzip2 ) + idn? ( net-dns/libidn2:= ) + nls? ( virtual/libintl ) + ssl? ( + !gnutls? ( + dev-libs/openssl:= + ) + gnutls? ( + dev-libs/libgcrypt:= + >=net-libs/gnutls-2.6.4:= + ) + )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.9.0_pre9-mint.patch" + "${FILESDIR}/${PN}-2.9.0_pre9-parallel.patch" +) + +src_configure() { + local myconf=( + --enable-cgi-links + --enable-color-style + --enable-externs + --enable-file-upload + --enable-included-msgs + --enable-ipv6 + --enable-nested-tables + --enable-nsl-fork + --enable-persistent-cookies + --enable-prettysrc + --enable-read-eta + --enable-scrollbar + --with-screen=ncursesw + --with-zlib + $(use_enable cjk) + $(use_enable idn idna) + $(use_enable nls) + $(use_with brotli) + $(use_with bzip2 bzlib) + ) + + if use ssl; then + myconf+=( + --with-$(usex gnutls gnutls ssl)="${EPREFIX}/usr" + ) + fi + + econf "${myconf[@]}" + + # Compared to openssl gnutls-openssl API does not use + # default trust store: bug #604526. + sed -e \ + "s|#define SSL_CERT_FILE NULL|#define SSL_CERT_FILE \"${EPREFIX}/etc/ssl/certs/ca-certificates.crt\"|" \ + -i userdefs.h || die +} + +src_compile() { + # generating translation files in parallel is currently broken + use nls && emake -C po -j1 + emake +} + +src_install() { + emake install DESTDIR="${D}" + + sed -i "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \ + "${ED}"/etc/lynx.cfg || die "lynx.cfg not found" + sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \ + "${ED}"/etc/lynx.cfg || die "lynx.cfg not found" + + dodoc CHANGES COPYHEADER PROBLEMS README + dodoc -r docs lynx_help +} diff --git a/www-client/lynx/lynx-2.9.0_pre12.ebuild b/www-client/lynx/lynx-2.9.0_pre12.ebuild deleted file mode 100644 index aad1ce08f70a..000000000000 --- a/www-client/lynx/lynx-2.9.0_pre12.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc -inherit verify-sig - -case ${PV} in - *_pre*) MY_P="${PN}${PV/_pre/dev.}" ;; - *_rc*) MY_P="${PN}${PV/_rc/pre.}" ;; - *_p*|*) MY_P="${PN}${PV/_p/rel.}" ;; -esac - -DESCRIPTION="An excellent console-based web browser with ssl support" -HOMEPAGE="https://lynx.invisible-island.net/" -SRC_URI="https://invisible-mirror.net/archives/${PN}/tarballs/${MY_P}.tar.bz2" -SRC_URI+=" verify-sig? ( https://invisible-mirror.net/archives/${PN}/tarballs/${MY_P}.tar.bz2.asc )" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="brotli bzip2 cjk gnutls idn nls ssl" - -RDEPEND=" - sys-libs/ncurses:=[unicode(+)] - sys-libs/zlib - brotli? ( app-arch/brotli:= ) - bzip2? ( app-arch/bzip2 ) - idn? ( net-dns/libidn:= ) - nls? ( virtual/libintl ) - ssl? ( - !gnutls? ( - dev-libs/openssl:= - ) - gnutls? ( - dev-libs/libgcrypt:= - >=net-libs/gnutls-2.6.4:= - ) - )" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) - verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) -" - -PATCHES=( - "${FILESDIR}/${PN}-2.9.0_pre9-mint.patch" - "${FILESDIR}/${PN}-2.9.0_pre9-parallel.patch" -) - -src_configure() { - local myconf=( - --enable-cgi-links - --enable-color-style - --enable-externs - --enable-file-upload - --enable-included-msgs - --enable-ipv6 - --enable-nested-tables - --enable-nsl-fork - --enable-persistent-cookies - --enable-prettysrc - --enable-read-eta - --enable-scrollbar - --with-screen=ncursesw - --with-zlib - $(use_enable cjk) - $(use_enable idn idna) - $(use_enable nls) - $(use_with brotli) - $(use_with bzip2 bzlib) - ) - - if use ssl; then - myconf+=( - --with-$(usex gnutls gnutls ssl)="${EPREFIX}/usr" - ) - fi - - econf "${myconf[@]}" - - # Compared to openssl gnutls-openssl API does not use - # default trust store: bug #604526. - sed -e \ - "s|#define SSL_CERT_FILE NULL|#define SSL_CERT_FILE \"${EPREFIX}/etc/ssl/certs/ca-certificates.crt\"|" \ - -i userdefs.h || die -} - -src_compile() { - # generating translation files in parallel is currently broken - use nls && emake -C po -j1 - emake -} - -src_install() { - emake install DESTDIR="${D}" - - sed -i "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \ - "${ED}"/etc/lynx.cfg || die "lynx.cfg not found" - sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \ - "${ED}"/etc/lynx.cfg || die "lynx.cfg not found" - - dodoc CHANGES COPYHEADER PROBLEMS README - dodoc -r docs lynx_help -} -- cgit v1.2.3-65-gdbad