diff options
Diffstat (limited to 'www-client/elinks')
-rw-r--r-- | www-client/elinks/Manifest | 7 | ||||
-rw-r--r-- | www-client/elinks/elinks-0.18.0.ebuild | 211 | ||||
-rw-r--r-- | www-client/elinks/elinks-9999.ebuild | 13 | ||||
-rw-r--r-- | www-client/elinks/files/elinks-0.18.0-sftp.patch | 22 | ||||
-rw-r--r-- | www-client/elinks/metadata.xml | 1 |
5 files changed, 248 insertions, 6 deletions
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest index bfe902dd7a52..73fa6ac29be7 100644 --- a/www-client/elinks/Manifest +++ b/www-client/elinks/Manifest @@ -3,9 +3,12 @@ AUX elinks-0.16.1.1-perl-5.38.patch 1527 BLAKE2B 1a39c77ef9d29490c745e58998e6798 AUX elinks-0.16.1.1-python-3.12.patch 974 BLAKE2B 65d50497cf889704ea9a4c0c23b6ee2108fd2c8312ea5be7758dc6e99d06edb57a30533b92e1893829549009c46a4cfb37e726f1a1cff203f48e5d394c1cd826 SHA512 a0b457e47762dd0c25d49d8c98f9d325e21232e431b6569c16cd9c6b989e79791bf182c1790f9193370c9abd31235ab1408c14384a70138b4e2d707f12067948 AUX elinks-0.17.1.1-gettext.patch 1863 BLAKE2B 114cc2c7496e4278441b3f0e434552eb1f3c7ebcc13f8b62580eae7cc1a9d8a13eacee3f5e96581b4c43ecd83f47e1f8f9df244749bf42dee1e13ef38a1ded83 SHA512 398ff4b8da7d560091eb55a645128a5fd1721c46cfba52381d17749f21b323188191d523ef9ff4954193f931dfff33cbc4f166930c500bb1dcf4a8337fa379db AUX elinks-0.17.1.1-sftp.patch 4296 BLAKE2B 6a9a7242669cd1349161507fdb24f5df15f17e0ae3310bc30a4d0c566decb7408602600f4b98935f51e57b63456e6697b3174b00ee92d49f0cb50a04ecebf620 SHA512 d66ffe068bec0fae880313bcaa7b3eab999421d2b1bcb69810c31d35e4ff5d205a810e94499d4fec07e01492ce5cd2125c85cc09819d7fec846d2b3ee08a13c9 +AUX elinks-0.18.0-sftp.patch 797 BLAKE2B 5c8aeddf5525a5584e2a9487f3200d348fbd50780746a442308e2a054375780dfdf004bcfc6898677ef6d6a196a5393ab00c55296e362b71e6757ffcd6649e2a SHA512 d0a16700d361d4b0f6fecc369ab721cdadf31e9a24c843e1b1daec25bef586324a89bad1a39aec7a4fce51c0eb561bb436bba941be052d1d86406f783fdfaaee DIST elinks-0.16.1.1.tar.xz 2037292 BLAKE2B 05578eaa7a88f0abe4472b876a1f72645d32119ce807a61962f8d24a5b444240d3b94189bf25142c0e51e2d404d5992ace07ecc23ef1316d5f3942736b265267 SHA512 49e03ff4766e29b6fd4324d226e415ca1329a84d4a44fac40ecd72186dd104de88c3e541810a008dc6f1d1ed889a45edbef159cbc6ac3860756ca21261ffec8a DIST elinks-0.17.1.1.tar.xz 2001036 BLAKE2B 2158e7630e64977b5250d544159bff0b90953ef7d51870d5e96ce8e36858596e6341bf774ad1717ed4808859d4be316fe75587552e61a8bbfcb00a0366a85e81 SHA512 7ad78f7d6a43341ae252c29f0c338e466cbedf8b40aefa9fa1939dbc62a9c9307b0a423b17181fce3bce1364fe6b6bdb80509ed90719965de174c9258b90902f +DIST elinks-0.18.0.tar.xz 2078656 BLAKE2B 84ad13a1f374d85bb74d57fe905df4f2f1d062acb89a43197e0f0767cce3779749f4cee7ad15655fe35bc6545799b5f8264498f05a47eca6cb571541e3bcef1c SHA512 e0ff737e06d4b591d362257b9a375b938f9d6222cf6ee4df2065c7b47f883a5eacf76dabae8fc7c0b32cf9b7df56267752217d6999b0ae24c2482763b5b0ccb9 EBUILD elinks-0.16.1.1-r100.ebuild 5185 BLAKE2B 5a1745bb13e840d883b964bc1017fd774d16df8be198e601a0d9f309674bdeff5ce697c63a5b452024aec21a21d5acc6152f2713c3834ff8e049e3a997b49fe1 SHA512 9a94d4773f5599fee9227672704065acba5f256597ececf4ac6d44c68fca7b8f6a59747e164f55a817d799c63414395eb14a4d07af1594ff42062f041cf5304c EBUILD elinks-0.17.1.1.ebuild 5497 BLAKE2B ffb87b9dbeb5a617e53434e8892f78b3076a86a4661cdcf9b85095cfc9e18ad341d9330b4da80dcf316c289bc584945655fb3a295824f89f48c7dc9cc1c927fa SHA512 15da1070391a124c9a9f92f0dbbf620203d01281d7755a8cc9ccd18751f0dc9fa5ce7f7e010fe4c2e2610a5c797ab6e54e539b16908ca38bd5ab6eeb068f2530 -EBUILD elinks-9999.ebuild 5296 BLAKE2B e77536bc7f8e0f117575026360d0643f9f6c4f2b26dc002d6f6816bc03f484908bc29e63f28fc327a987cea33e323862d638c0c049ee8bcc773e69e2d94c42bf SHA512 57a18adee8d60bca924f15c0e818f83ca5432722b6e86354328496d6b4248f657c02f20401a2c55da441a2821c0a5a41d901ab92a4cf9e2a4a464075ca9f9328 -MISC metadata.xml 1108 BLAKE2B c1606bb87c902d273a083406ed4b8aeee0a9fb3af56813fe4c9fd34bfb8aaf04a67540ef8daf193c4378810134f36784e755317fdf7fd6357e109d60c20bd756 SHA512 372652a1744438df72d47d57ac05b1f737665e991eff04fe31c5dd3d22b4694053429b71a34a72b80d1c6f60c023a89572fbad734b8b5359ee1df04e86315d55 +EBUILD elinks-0.18.0.ebuild 5493 BLAKE2B 1366a6efe9c60f3f83db925df67576eeb6db0a87ebf00133ba1442c7d109487e0bdef2cb584cb5299cb279255ae8459f059e0e42778686669c836f4eb2129ef1 SHA512 4ba3fd5123ae878c692a759e0e713d77d453e5e17f29b01c9709b57297c54e16f8e64a8598db4a8f75c89cf2174fb7746646fb883688092adc480b2a3ef20bb1 +EBUILD elinks-9999.ebuild 5449 BLAKE2B 73d53438ce6eed7abde9305f0b076b477e82e151bff927f0a3578ad9f4dce2974d988d068470d4fa15dde59117851a979d302b6e1018c551cd73d295a9942b71 SHA512 2d7c741e03621992d9207692305100a34727aa622fa44a9e2a8b181a683ff5a3c7901bc2baa98c95b1caa25d066f16fa08604c36301c424053d0d82e9ecec20b +MISC metadata.xml 1193 BLAKE2B fde547df5b9166e328b1a2dd215e209104b21b4cc2f2b37e3e1882c5204e8705a97724daca6fedf9bbfbb75a399f37245a2c099d8524acacc8e7cf3bbe79b970 SHA512 a17e729f799223a1bd7a88a41ac10575f621d13acdadb1d75118b86632f6ed03993894a38537594621f987e95224dab4fcddae5f2bbe3b7d8129db672aa67764 diff --git a/www-client/elinks/elinks-0.18.0.ebuild b/www-client/elinks/elinks-0.18.0.ebuild new file mode 100644 index 000000000000..5f0b41536b9e --- /dev/null +++ b/www-client/elinks/elinks-0.18.0.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GUILE_REQ_USE="deprecated" +GUILE_COMPAT=( 2-2 3-0 ) +PYTHON_COMPAT=( python3_{10..13} ) +LUA_COMPAT=( lua5-{1,2,3,4} luajit ) + +inherit flag-o-matic guile-single meson lua-single python-single-r1 + +DESCRIPTION="Advanced and well-established text-mode web browser" +HOMEPAGE="http://elinks.or.cz/" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/rkd77/felinks" + inherit git-r3 +else + SRC_URI="https://github.com/rkd77/elinks/releases/download/v${PV}/${P}.tar.xz" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="bittorrent brotli bzip2 curl debug finger ftp gemini gopher gpm gnutls guile idn" +IUSE+=" javascript libcss lua lzma +mouse nls nntp perl python samba sftp ssl test tre unicode X xml zlib zstd" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + guile? ( ${GUILE_REQUIRED_USE} ) + javascript? ( curl libcss ) + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + sftp? ( curl ) +" + +RDEPEND=" + >=sys-libs/ncurses-5.2:=[unicode(+)] + brotli? ( app-arch/brotli:= ) + bzip2? ( >=app-arch/bzip2-1.0.2 ) + curl? ( net-misc/curl[ssl] ) + gpm? ( + >=sys-libs/gpm-1.20.0-r5 + ) + guile? ( ${GUILE_DEPS} ) + idn? ( net-dns/libidn2:= ) + javascript? ( + dev-cpp/libxmlpp:5.0 + dev-lang/mujs:= + ) + libcss? ( + >=dev-libs/libcss-0.9.2 + >=net-libs/libdom-0.4.2 + ) + lua? ( ${LUA_DEPS} ) + lzma? ( app-arch/xz-utils ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + samba? ( net-fs/samba ) + ssl? ( + !gnutls? ( dev-libs/openssl:= ) + gnutls? ( net-libs/gnutls:= ) + ) + tre? ( dev-libs/tre ) + X? ( + x11-libs/libX11 + x11-libs/libXt + ) + xml? ( >=dev-libs/expat-1.95.4 ) + zlib? ( >=sys-libs/zlib-1.1.4 ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( + net-dns/libidn + ) +" + +PATCHES=( + "${FILESDIR}"/${P}-sftp.patch +) + +pkg_setup() { + use guile && guile-single_pkg_setup + use lua && lua-single_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + default + use guile && guile_bump_sources + python_fix_shebang . +} + +src_configure() { + # This file is severely broken w.r.t. strict-aliasing and upstream acknowledges it: + # https://github.com/rkd77/elinks/blob/d05ce90b35d82109aab320b490e3ca54aa6df057/src/util/lists.h#L14 + # https://github.com/rkd77/elinks/blob/d05ce90b35d82109aab320b490e3ca54aa6df057/src/meson.build#L44 + # + # Although they force fno-strict-aliasing, they do so inconsistently and not for the testsuite (!!!). + # Just add it again. + # + # DO not trust the LTO either. + append-flags -fno-strict-aliasing + filter-lto + + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + -Dhtmldoc=false + -Dpdfdoc=false + -Dapidoc=false + -D88-colors=true + -D256-colors=true + -Dbacktrace=$(usex elibc_musl false true) + $(meson_use bittorrent) + $(meson_use brotli) + $(meson_use bzip2 bzlib) + $(meson_use curl libcurl) + $(usex debug '-Ddebug=true' '-Dfastmem=true') + $(meson_use finger) + $(meson_use ftp) + -Dfsp=false + $(meson_use gemini) + $(meson_use nls gettext) + $(meson_use gopher) + $(meson_use gpm) + $(meson_use guile) + -Dgssapi=false + -Dhtml-highlight=true + $(meson_use idn) + $(meson_use javascript mujs) + -Dipv6=true + -Dleds=true + $(meson_use libcss) + -Dlibev=false + -Dlibevent=false + -Dluapkg=$(usex lua ${ELUA:-0} '') + $(meson_use lzma) + $(meson_use mouse) + $(meson_use nls) + $(meson_use nntp) + $(meson_use perl) + $(meson_use python) + -Dquickjs=false + -Druby=false + $(meson_use samba smb) + $(meson_use sftp) + -Dsm-scripting=false + -Dspidermonkey=false + -Dterminfo=true + $(meson_use test) + $(meson_use tre) + -Dtrue-color=true + $(meson_use xml xbel) + $(meson_use X x) + $(meson_use zlib) + $(meson_use zstd) + ) + + if use ssl ; then + if use gnutls ; then + emesonargs+=( -Dgnutls=true ) + else + emesonargs+=( -Dopenssl=true) + fi + else + emesonargs+=( -Dgnutls=false -Dopenssl=false ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + insinto /etc/elinks + newins contrib/keybind-full.conf keybind-full.sample + newins contrib/keybind.conf keybind.conf.sample + + dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md SITES THANKS TODO doc/*.* + docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*} + docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote} + docinto contrib/conv ; dodoc contrib/conv/*.* + docinto contrib/guile ; dodoc contrib/guile/*.scm + + # elinks uses an internal copy of gettext which ships files that may + # collide with the system's gettext (https://bugs.gentoo.org/635090) + rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die + + use guile && guile_unstrip_ccache +} + +pkg_postinst() { + elog "If upgrading from a version prior to 0.17.0, you will need to move" + elog "your configuration from ~/.elinks to \${XDG_CONFIG_HOME}/elinks" + elog + elog "You may want to convert your html.cfg and links.cfg of" + elog "Links or older ELinks versions to the new ELinks elinks.conf" + elog "using ${EROOT}/usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl" + elog + elog "Please have a look at ${EROOT}/etc/elinks/keybind-full.sample and" + elog "${EROOT}/etc/elinks/keybind.conf.sample for some bindings examples." + elog + elog "You will have to set your TERM variable to 'xterm-256color'" + elog "to be able to use 256 colors in elinks." +} diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild index daa906d436ce..780dfce3fd3a 100644 --- a/www-client/elinks/elinks-9999.ebuild +++ b/www-client/elinks/elinks-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,20 +24,22 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="bittorrent brotli bzip2 debug finger ftp gemini gopher gpm gnutls guile idn" -IUSE+=" javascript libcss lua lzma +mouse nls nntp perl python samba ssl test tre unicode X xml zlib zstd" +IUSE="bittorrent brotli bzip2 curl debug finger ftp gemini gopher gpm gnutls guile idn" +IUSE+=" javascript libcss lua lzma +mouse nls nntp perl python samba sftp ssl test tre unicode X xml zlib zstd" RESTRICT="!test? ( test )" REQUIRED_USE=" guile? ( ${GUILE_REQUIRED_USE} ) - javascript? ( libcss ) + javascript? ( curl libcss ) lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) + sftp? ( curl ) " RDEPEND=" >=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) + curl? ( net-misc/curl[ssl] ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) @@ -110,9 +112,11 @@ src_configure() { -Dapidoc=false -D88-colors=true -D256-colors=true + -Dbacktrace=$(usex elibc_musl false true) $(meson_use bittorrent) $(meson_use brotli) $(meson_use bzip2 bzlib) + $(meson_use curl libcurl) $(usex debug '-Ddebug=true' '-Dfastmem=true') $(meson_use finger) $(meson_use ftp) @@ -141,6 +145,7 @@ src_configure() { -Dquickjs=false -Druby=false $(meson_use samba smb) + $(meson_use sftp) -Dsm-scripting=false -Dspidermonkey=false -Dterminfo=true diff --git a/www-client/elinks/files/elinks-0.18.0-sftp.patch b/www-client/elinks/files/elinks-0.18.0-sftp.patch new file mode 100644 index 000000000000..d0e024b4a031 --- /dev/null +++ b/www-client/elinks/files/elinks-0.18.0-sftp.patch @@ -0,0 +1,22 @@ +From 22a72290ac41d27238a8861eea60b5cf3878b94b Mon Sep 17 00:00:00 2001 +From: Felix Janda <felix.janda@posteo.de> +Date: Sat, 18 Jan 2025 15:50:32 -0500 +Subject: [PATCH] [sftp] add declaration of ftp_curl_handle_error + +fixes compilation error when sftp is enabled but ftp is disabled +--- + src/protocol/curl/sftp.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/protocol/curl/sftp.h b/src/protocol/curl/sftp.h +index 2ec5a0542..5b42bccaa 100644 +--- a/src/protocol/curl/sftp.h ++++ b/src/protocol/curl/sftp.h +@@ -12,6 +12,7 @@ extern struct module sftp_protocol_module; + + #if defined(CONFIG_SFTP) && defined(CONFIG_LIBCURL) + extern protocol_handler_T sftp_protocol_handler; ++void ftp_curl_handle_error(struct connection *conn, CURLcode res); + #else + #define sftp_protocol_handler NULL + #endif diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml index 2c7701cba575..6c05bbc00043 100644 --- a/www-client/elinks/metadata.xml +++ b/www-client/elinks/metadata.xml @@ -16,6 +16,7 @@ <flag name="gopher">Enable support for the gopher protocol</flag> <flag name="libcss">Enable support for cascading style sheets via <pkg>dev-libs/libcss</pkg></flag> <flag name="mouse">Make elinks to grab all mouse events</flag> + <flag name="sftp">Add support for sftp (requires <pkg>net-misc/curl</pkg>).</flag> <flag name="tre">Enable support for regex searches via <pkg>dev-libs/tre</pkg></flag> <flag name="xml">Enable support for bookmarks via <pkg>dev-libs/expat</pkg></flag> </use> |