From 30737dc88991519b90363c2c7bae8fd049098d13 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 14 Oct 2022 01:43:18 +0100 Subject: gentoo auto-resync : 14:10:2022 - 01:43:18 --- www-client/Manifest.gz | Bin 6199 -> 6210 bytes www-client/chromium/Manifest | 2 +- www-client/chromium/chromium-106.0.5249.119.ebuild | 2 +- www-client/elinks/Manifest | 9 +- www-client/elinks/elinks-0.13.5-r100.ebuild | 4 +- www-client/elinks/elinks-0.15.1-r1.ebuild | 158 +++++++++++++++++++++ www-client/elinks/elinks-0.15.1.ebuild | 148 ------------------- www-client/elinks/elinks-9999.ebuild | 6 + .../elinks/files/elinks-0.13.5-parallel-make.patch | 51 +++++++ .../files/elinks-0.15.1-no-mouse-build.patch | 40 ++++++ .../elinks/files/elinks-9999-parallel-make.patch | 51 ------- 11 files changed, 264 insertions(+), 207 deletions(-) create mode 100644 www-client/elinks/elinks-0.15.1-r1.ebuild delete mode 100644 www-client/elinks/elinks-0.15.1.ebuild create mode 100644 www-client/elinks/files/elinks-0.13.5-parallel-make.patch create mode 100644 www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch delete mode 100644 www-client/elinks/files/elinks-9999-parallel-make.patch (limited to 'www-client') diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz index fa5f4a736364..42433264c4a6 100644 Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 0fc25dfff751..2739d471bf12 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -22,7 +22,7 @@ DIST chromium-108-patchset-2.tar.xz 6480 BLAKE2B 2a40bb741fdd305b3525b790f82c2b3 DIST chromium-108.0.5343.2.tar.xz 1669214708 BLAKE2B e022bb908b15a5ae645d23cc5ab1e268ab87b77af3ae9ac352f6dc2fc9ba36f9e212cd53f4e3fdb18bb114f89ffada3f0fbee2b2fd46b6824fccaa68e21d930a SHA512 ff74eae98a44ebfc77a729ee65b4d338fcc39f04f2168247eed039d5c19c945d90c2b6aa5a12ca96d493c5116c2dcf9c959c74ffe2dc25ea6717176f699342b2 DIST chromium-profiler-0.1.tar 269066240 BLAKE2B 6897387b63ff9a724b67f2e8799fe803dc75da376da809e752d19d6f5cf98bd84ac24161d07ac4a967577279e9ad5a8a46f0825332a7ee933a27693d6dc95611 SHA512 3fb6132599d28455d1b5c04d856ea7623e49b0b0b96f021c31d0952c4ba57d69d0a1cae6f0b91470a235221c89cc0d3bb38303ff02594ed0739712e6e2f8dbcc EBUILD chromium-106.0.5249.103.ebuild 37268 BLAKE2B a9eb56e489c480e61c73b0f43cd42901b4d1f6efb8c21a2a14d9e5b5f70a8ab19a2305acab01d767243973ce85df06c14179a79eeada51b17f57ea946e9115f1 SHA512 554c7cdf1e897312fb869108495245acd5ff9dde8be9aa9fe96ddc990015f3dc55dc081c2813783f9e5ccaa2a2b2091a96fb1fd2278aad5474ccfb234e255fc0 -EBUILD chromium-106.0.5249.119.ebuild 37269 BLAKE2B a803c4ae42c30e0ca579b532baa663f901c41df24cca59a3a7a6d0a831b3bb73d952352aea543334a84eb8e5e595c614659b4c00d8045e87acb0399bb8b95238 SHA512 87febb65b120669dc007d981d77141c09a7ad33d06ae1f2fd0fb5d85365316147c13a4e6a13004357ae883c79add39cd44a66fe58935c3bc375b9d39539aff48 +EBUILD chromium-106.0.5249.119.ebuild 37268 BLAKE2B a9eb56e489c480e61c73b0f43cd42901b4d1f6efb8c21a2a14d9e5b5f70a8ab19a2305acab01d767243973ce85df06c14179a79eeada51b17f57ea946e9115f1 SHA512 554c7cdf1e897312fb869108495245acd5ff9dde8be9aa9fe96ddc990015f3dc55dc081c2813783f9e5ccaa2a2b2091a96fb1fd2278aad5474ccfb234e255fc0 EBUILD chromium-107.0.5304.29.ebuild 37536 BLAKE2B f0b3e491c3ae2fe3f973f3f2eae9f9d9f209fee1b4416896091a17ed9f804054f45d8f666cf39814394ac00b2cc9100f073caa4fbe0dd8b559e7027768405d29 SHA512 878a3798199f44fcdbab361e867f15bc5a0b01b7ca4d0e6b6334a860331e7535b43a4bb9085950e588cbee98c373ad10af19b652ab9979899a39dc2f65b7178a EBUILD chromium-108.0.5343.2.ebuild 37493 BLAKE2B 1c133c672b80baf1732aa2095f6060c9ff79d90d843dc001ccb3fec638119cd95e98b88feedf8f698979b50ae0d5952d869f33f625f267d6f830a0f1c31e35fd SHA512 8fb7a44da1de704c97ddab04d1e003c36bc8c4f067b1728f13f8193e9e6f3185a35293a8c6d00132cdd0757deab87bc7c809ec4123e551118cd1d94926639791 MISC metadata.xml 2128 BLAKE2B f78ae4671e2a0c0df19c9c43b8500b2de2226ee6b3979dd060d6430872c33072c380ea2438063a68b5aa413bce265d3c5b04097e09b11dfd92fe0067e66dfeea SHA512 4693a4782ea679520e4a09a5d4905dc202fc8d422757864069c455692b56101acb68aca588f3c8e07597ef3c6dd37dab7c7b1184c6d1c0f907d838f99097a4fe diff --git a/www-client/chromium/chromium-106.0.5249.119.ebuild b/www-client/chromium/chromium-106.0.5249.119.ebuild index dccdddcc2720..51bd19ec0ca3 100644 --- a/www-client/chromium/chromium-106.0.5249.119.ebuild +++ b/www-client/chromium/chromium-106.0.5249.119.ebuild @@ -24,7 +24,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0/stable" -KEYWORDS="amd64 ~arm64" +KEYWORDS="amd64 arm64" IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine" REQUIRED_USE=" component-build? ( !suid !libcxx ) diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest index ad51803398e9..51b1514e4c6e 100644 --- a/www-client/elinks/Manifest +++ b/www-client/elinks/Manifest @@ -1,7 +1,8 @@ -AUX elinks-9999-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9ae63f8014b6ff50d96f5534d1c08a0eaf73825da5cf1605d8a0997c6bd659b621b8f174a555f1adc026823fd2f87196eadb SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248 +AUX elinks-0.13.5-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9ae63f8014b6ff50d96f5534d1c08a0eaf73825da5cf1605d8a0997c6bd659b621b8f174a555f1adc026823fd2f87196eadb SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248 +AUX elinks-0.15.1-no-mouse-build.patch 1363 BLAKE2B 226f194389aa48520089c62a15c9c910aa7db9cac56c2922c321d5e7cda08df09a2075fd2a077dbe3fbaab5b4b60809d69e6536ae3f5a4ddfb64b97f60e30824 SHA512 faa9dcd6cce8dda22e4a9366b8b0af282b720b2232fa8012d15762cad233429ae4bb1c763a8cb630155d845e4c089e2f01bea3bce1529c5fb7a686170351d76d DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43 SHA512 786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b DIST elinks-0.15.1.tar.xz 1997208 BLAKE2B dcec7054d417842e709f26bab53ddb1bf43556de4c69d116ad1e049664bc7c5a5513f02cee500d591252b439a66f354079e2e3eff5692202102cb900e06340c2 SHA512 677eeeeab3fc24dcfe4e7248a9c1a8e07083ebd13bd9923d89702a04dbe1c3e4d4038029c095881183d7f11ae2c5317ff7e5458320644fde0c176378b89068d8 -EBUILD elinks-0.13.5-r100.ebuild 3796 BLAKE2B 9e3a6ca9385b17b808a6e383c892b5e1aaf037aaee591577bee5d93613c5188f0afd916c43eb853adf7ee52598ad79d768dac6ec990c506340f5c6126a11d835 SHA512 2260d36a989d28bec8640ae685b9fa47d42ceb57df24f83965acf93f7144a9e767a63db1dea040d2a166e352a449e45e41e83ee7eb02655784945c7065a193a1 -EBUILD elinks-0.15.1.ebuild 3837 BLAKE2B 58707aecaeda40cc453358f3e84a55ae436e582f70e4344af8630ad67f5ec9db5738eb639123fcd1f99bfed0e069b8febe47a44e12486ca0be434807ea454e6e SHA512 179e9d2e5633acb464ba911a9601c3b00e496ec3bf4144482687bdb75df55c76f9d2129a6f37baa84076df65a9d24cbc70547e4164d2b312b214573ecb12030a -EBUILD elinks-9999.ebuild 3837 BLAKE2B 58707aecaeda40cc453358f3e84a55ae436e582f70e4344af8630ad67f5ec9db5738eb639123fcd1f99bfed0e069b8febe47a44e12486ca0be434807ea454e6e SHA512 179e9d2e5633acb464ba911a9601c3b00e496ec3bf4144482687bdb75df55c76f9d2129a6f37baa84076df65a9d24cbc70547e4164d2b312b214573ecb12030a +EBUILD elinks-0.13.5-r100.ebuild 3790 BLAKE2B 776e05d0e117f418c3a6b287e458b7fc928769516b1212518c369f2f3c8fd060ae8650dfec516dde7181ae8baa03f607d4b67732af5c629e6c60b5dd856ef7e3 SHA512 e05697df2ea94642e0a5cc8a970b4a52e2bd50b4013d4db0f2dc8b6d9337f2dd8416fc4a1f8ae7e8cefc4087c595014d3a772c1344e08cac8a793808bd1badcc +EBUILD elinks-0.15.1-r1.ebuild 3967 BLAKE2B b6ee6fb00cf947c9cd88483e50e5b21e6acc8d32d5fa1f73ef4b8137bf893ccc6ae38ff31663e3b2878b04308094bc01461d9c2c9d9ceef2531ce82ecb34fb9f SHA512 8af45854ecb80577b5835ae4af724ca6f205e0ec6cc557cab1aefcc213d8c6ef2e75b400ba455937e974aad548e655cfbf53c53718086d9dc0f267b4f92ce441 +EBUILD elinks-9999.ebuild 3913 BLAKE2B 8aec699ce63d79d01874c1df8560e28b2f6ca92d1499f8a41c92aaa68d8e75d056273d4db8d3ba86503067bfefc961fd8b4f1481d1f4b8bee3886d0d53448346 SHA512 3c7c939b3b77df70d98f8ff2e55e7d1ab6bff5240cf9b5a3adba8f6872937598db928c2e862d278e855b81beacd1bb8239056bdae63b49946abf36f09d11a517 MISC metadata.xml 1005 BLAKE2B 1e40dd6ba072df609a2ec93e5ae5af079137e19d38b058df45dbe63e4ecfb6facc9d89a206991713616d9c0671eece6ebbe8eeaa9e4c284e982bada17c149570 SHA512 432636be610931a5087b3ebcf70d250b212b8c4f7c236679a2a5207996393329b3db31432228fa6ac2e2fd8348d8e2c04dba9b817526ecbe314276f55e0dfe2e diff --git a/www-client/elinks/elinks-0.13.5-r100.ebuild b/www-client/elinks/elinks-0.13.5-r100.ebuild index b4dfb74b0dae..a3b49623550e 100644 --- a/www-client/elinks/elinks-0.13.5-r100.ebuild +++ b/www-client/elinks/elinks-0.13.5-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -49,7 +49,7 @@ DEPEND="${RDEPEND} ${PYTHON_DEPS}" PATCHES=( - "${FILESDIR}"/${PN}-9999-parallel-make.patch + "${FILESDIR}"/${P}-parallel-make.patch ) src_prepare() { diff --git a/www-client/elinks/elinks-0.15.1-r1.ebuild b/www-client/elinks/elinks-0.15.1-r1.ebuild new file mode 100644 index 000000000000..655204af0f0f --- /dev/null +++ b/www-client/elinks/elinks-0.15.1-r1.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +LUA_COMPAT=( lua5-{1,2} ) + +inherit meson lua-single python-any-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 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn + lua lzma +mouse nls nntp perl samba ssl tre unicode X xml zlib zstd" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +RDEPEND=" + >=sys-libs/ncurses-5.2:=[unicode(+)] + brotli? ( app-arch/brotli:= ) + bzip2? ( >=app-arch/bzip2-1.0.2 ) + gpm? ( + >=sys-libs/gpm-1.20.0-r5 + ) + guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) + idn? ( net-dns/libidn:= ) + lua? ( ${LUA_DEPS} ) + lzma? ( app-arch/xz-utils ) + perl? ( dev-lang/perl:= ) + 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}" +BDEPEND=" + ${PYTHON_DEPS} + nls? ( sys-devel/gettext ) + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-no-mouse-build.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup + + python-any-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + -D88-colors=true + -D256-colors=true + $(meson_use bittorrent) + $(meson_use brotli) + $(meson_use bzip2 bzlib) + $(usex debug '-Ddebug=true' '-Dfastmem=true') + $(meson_use finger) + $(meson_use ftp) + -Dfsp=false + -Dgemini=false + -Dgettext=true + $(meson_use gopher) + $(meson_use gpm) + $(meson_use guile) + -Dgssapi=false + -Dhtml-highlight=true + $(meson_use idn) + -Dipv6=true + -Dleds=true + -Dlibev=false + -Dlibevent=false + -Dluapkg=$(usex lua ${ELUA:-0} '') + $(meson_use lzma) + $(meson_use mouse) + #-Dmujs=false + $(meson_use nls) + $(meson_use nntp) + $(meson_use perl) + -Dpython=false + -Dquickjs=false + -Druby=false + $(meson_use samba smb) + -Dsm-scripting=false + -Dspidermonkey=false + -Dterminfo=true + $(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 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 +} + +pkg_postinst() { + 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-0.15.1.ebuild b/www-client/elinks/elinks-0.15.1.ebuild deleted file mode 100644 index 1ea79ed7f5de..000000000000 --- a/www-client/elinks/elinks-0.15.1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -LUA_COMPAT=( lua5-{1,2} ) - -inherit meson lua-single python-any-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 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn - lua lzma +mouse nls nntp perl samba ssl tre unicode X xml zlib zstd" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -RDEPEND=" - >=sys-libs/ncurses-5.2:=[unicode(+)] - brotli? ( app-arch/brotli:= ) - bzip2? ( >=app-arch/bzip2-1.0.2 ) - gpm? ( - >=sys-libs/gpm-1.20.0-r5 - ) - guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) - idn? ( net-dns/libidn:= ) - lua? ( ${LUA_DEPS} ) - lzma? ( app-arch/xz-utils ) - perl? ( dev-lang/perl:= ) - 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}" -BDEPEND=" - ${PYTHON_DEPS} - nls? ( sys-devel/gettext ) - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -D88-colors=true - -D256-colors=true - $(meson_use bittorrent) - $(meson_use brotli) - $(meson_use bzip2 bzlib) - $(usex debug '-Ddebug=true' '-Dfastmem=true') - $(meson_use finger) - $(meson_use ftp) - -Dfsp=false - -Dgemini=false - -Dgettext=true - $(meson_use gopher) - $(meson_use gpm) - $(meson_use guile) - -Dgssapi=false - -Dhtml-highlight=true - $(meson_use idn) - -Dipv6=true - -Dleds=true - -Dlibev=false - -Dlibevent=false - -Dluapkg=$(usex lua ${ELUA:-0} '') - $(meson_use lzma) - $(meson_use mouse) - #-Dmujs=false - $(meson_use nls) - $(meson_use nntp) - $(meson_use perl) - -Dpython=false - -Dquickjs=false - -Druby=false - $(meson_use samba smb) - -Dsm-scripting=false - -Dspidermonkey=false - -Dterminfo=true - $(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 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 -} - -pkg_postinst() { - 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 1ea79ed7f5de..20caa1f92b40 100644 --- a/www-client/elinks/elinks-9999.ebuild +++ b/www-client/elinks/elinks-9999.ebuild @@ -59,6 +59,12 @@ BDEPEND=" virtual/pkgconfig " +pkg_setup() { + use lua && lua-single_pkg_setup + + python-any-r1_pkg_setup +} + src_configure() { local emesonargs=( -D88-colors=true diff --git a/www-client/elinks/files/elinks-0.13.5-parallel-make.patch b/www-client/elinks/files/elinks-0.13.5-parallel-make.patch new file mode 100644 index 000000000000..86aea5588a2f --- /dev/null +++ b/www-client/elinks/files/elinks-0.13.5-parallel-make.patch @@ -0,0 +1,51 @@ +--- a/Makefile.lib 2014-05-30 13:45:11.756422117 -0400 ++++ b/Makefile.lib 2014-05-30 13:47:22.626423230 -0400 +@@ -117,7 +117,7 @@ + $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \ + $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME))) + +-$(LIB_O_NAME): $(LIB_O_DEPS) ++$(LIB_O_NAME): all-recursive.built $(LIB_O_DEPS) + $(call cmd,ld_objs) + + DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src)) +@@ -260,21 +260,36 @@ + # remaining subdirectories, but return an error at the end. + $(RULES_REC): + ifneq (,$(findstring k,$(MAKEFLAGS))) +- @suberr=0; \ ++ @+suberr=0; \ + $(foreach subdir,$(sort $(SUBDIRS)), \ + $(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || suberr=1;) \ + exit $$suberr + else +- @$(foreach subdir,$(sort $(SUBDIRS)), \ ++ @+$(foreach subdir,$(sort $(SUBDIRS)), \ + $(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || exit 1;) + endif + ++all-recursive.built: ++ifneq (,$(findstring k,$(MAKEFLAGS))) ++ @+suberr=0; \ ++ $(foreach subdir,$(sort $(SUBDIRS)), \ ++ $(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || suberr=1;) \ ++ [ $$suberr == 0 ] && touch $@; \ ++ exit $$suberr ++else ++ @+$(foreach subdir,$(sort $(SUBDIRS)), \ ++ $(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || exit 1;) \ ++ touch $@ ++endif ++ ++CLEAN += all-recursive.built ++ + # Dummy -local rules + $(RULES_LOCAL): + + # Default deps + rule_deps = $(1)-recursive $(1)-default $(1)-local +-all: $(call rule_deps,all) ++all: $(subst recursive,recursive.built,$(call rule_deps,all)) + install: $(call rule_deps,install) + clean: $(call rule_deps,clean) + cleanall: $(call rule_deps,cleanall) diff --git a/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch b/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch new file mode 100644 index 000000000000..cee5bdac4a83 --- /dev/null +++ b/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch @@ -0,0 +1,40 @@ +https://bugs.gentoo.org/876953 +https://github.com/rkd77/elinks/issues/189 +https://github.com/rkd77/elinks/commit/d229ebe89cb2a5e08e9d0af98faaa59ba2089fb3 + +From d229ebe89cb2a5e08e9d0af98faaa59ba2089fb3 Mon Sep 17 00:00:00 2001 +From: Witold Filipczyk +Date: Fri, 9 Sep 2022 11:30:21 +0200 +Subject: [PATCH] [options] Do not compile-in mouse related functions when + mouse support is disabled. Refs #189 + +--- a/src/config/options.c ++++ b/src/config/options.c +@@ -896,6 +896,7 @@ change_hook_ui_double_esc(struct session *ses, struct option *current, struct op + return 0; + } + ++#ifdef CONFIG_MOUSE + static int + change_hook_ui_mouse_disable(struct session *ses, struct option *current, struct option *changed) + { +@@ -911,7 +912,7 @@ change_hook_ui_mouse_disable(struct session *ses, struct option *current, struct + } + return 0; + } +- ++#endif + + /** Make option templates visible or invisible in the option manager. + * This is called once on startup, and then each time the value of the +@@ -988,7 +989,9 @@ static const struct change_hook_info change_hooks[] = { + { "ui.colors", change_hook_ui_colors }, + { "ui.double_esc", change_hook_ui_double_esc }, + { "ui.language", change_hook_language }, ++#ifdef CONFIG_MOUSE + { "ui.mouse_disable", change_hook_ui_mouse_disable }, ++#endif + { "ui", change_hook_ui }, + { NULL, NULL }, + }; + diff --git a/www-client/elinks/files/elinks-9999-parallel-make.patch b/www-client/elinks/files/elinks-9999-parallel-make.patch deleted file mode 100644 index 86aea5588a2f..000000000000 --- a/www-client/elinks/files/elinks-9999-parallel-make.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/Makefile.lib 2014-05-30 13:45:11.756422117 -0400 -+++ b/Makefile.lib 2014-05-30 13:47:22.626423230 -0400 -@@ -117,7 +117,7 @@ - $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \ - $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME))) - --$(LIB_O_NAME): $(LIB_O_DEPS) -+$(LIB_O_NAME): all-recursive.built $(LIB_O_DEPS) - $(call cmd,ld_objs) - - DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src)) -@@ -260,21 +260,36 @@ - # remaining subdirectories, but return an error at the end. - $(RULES_REC): - ifneq (,$(findstring k,$(MAKEFLAGS))) -- @suberr=0; \ -+ @+suberr=0; \ - $(foreach subdir,$(sort $(SUBDIRS)), \ - $(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || suberr=1;) \ - exit $$suberr - else -- @$(foreach subdir,$(sort $(SUBDIRS)), \ -+ @+$(foreach subdir,$(sort $(SUBDIRS)), \ - $(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || exit 1;) - endif - -+all-recursive.built: -+ifneq (,$(findstring k,$(MAKEFLAGS))) -+ @+suberr=0; \ -+ $(foreach subdir,$(sort $(SUBDIRS)), \ -+ $(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || suberr=1;) \ -+ [ $$suberr == 0 ] && touch $@; \ -+ exit $$suberr -+else -+ @+$(foreach subdir,$(sort $(SUBDIRS)), \ -+ $(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || exit 1;) \ -+ touch $@ -+endif -+ -+CLEAN += all-recursive.built -+ - # Dummy -local rules - $(RULES_LOCAL): - - # Default deps - rule_deps = $(1)-recursive $(1)-default $(1)-local --all: $(call rule_deps,all) -+all: $(subst recursive,recursive.built,$(call rule_deps,all)) - install: $(call rule_deps,install) - clean: $(call rule_deps,clean) - cleanall: $(call rule_deps,cleanall) -- cgit v1.2.3