gentoo resync : 29.12.2022

4 files changed, 7 insertions, 181 deletions

diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 0b7596d06514..95b3dd376f37 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,6 +1,5 @@
-DIST links-2.25.tar.bz2 6505187 BLAKE2B 3efe9d43b9a8dad498101800ccdefd094a6371a2c74b264aaaaac2abf951db38729abcf00f74a45fdb7f0d24196413996aa02cd9d2ea3ee2cf008faf4062e365 SHA512 b094e3b2096b07da8385d6021e5a5794f5b602c90ec824c48b897e6b69def6d69cb879af3008a4af43effaa7d9359bf09e4feb8ed5371bb7ff22ffcb0794f690
 DIST links-2.26.tar.bz2 6508447 BLAKE2B e0bf5ac4e05a8e14ae7342aed7bb7ac0f5f6c2d9e23adda221cc3ba73f39020c95cef90d10d5c9d0697797683ff1edf1ed55a4d8aca0930b2eb01b547a21bf00 SHA512 b732f88ae0e9f63f577fc3041058c56b43ffec3b797328453d0770e326010b05fcc04128287ef35b0d189bd0768446057d8773e10f8e0a76bab72fb252cdd530
-EBUILD links-2.25-r3.ebuild 3452 BLAKE2B ff38b5749abb96c4d3c4c77b6633eb22c74e548d8fef48a1871567645b5cd74975cfdd2eca2beb6aa5adc1046df6e2635635229c7420bae6470d358486ddc28c SHA512 7bdde3e120081a62ebe6f8e2296fd4358c93901da36f1b66bcd69cbb1d9af9d45becd4fee98fe025782dc9c0fa1228d02d4b8eececfa0a15c55e01f393a086cf
-EBUILD links-2.26-r1.ebuild 3553 BLAKE2B 5bc1ec28f204aa204d920f357181da19cda419196f113c97224b01165828bba005fe102262c5ba534f226fb4b1f4626fd1762045ccfb41236235220eff9426e7 SHA512 b6f8019ba38917dd1fab40def9001100328351c6819c583411291daa33da6544fae3eae51791116c6b23e4845b0aceab59a10566ce64eac09a4430f52faee954
-EBUILD links-2.26.ebuild 3529 BLAKE2B da577f9cb5866a81aaaa08410a78a59ba01af4bbf587f778fc209246ba5f04e877ee14c4abe1f56a527e07b81e6a20e3cd4243f28cec720d78adcaa1a5506f83 SHA512 55306852d00f5717dedffea3c62e86373cb2ff34d90a4b22ca67b7de17bd0c6b7a814c25890bcfb0496d29749ff6ca61f9824dcc8e6956a222c3379e5b502118
+DIST links-2.27.tar.bz2 6510121 BLAKE2B c7326147c583ad380f1b528a216ecf056a40a2939b290d69061682aa9f397ab3eabb71691cb68efcd0739b67acbe1f38f95a8a347d5045efe671eacfd0e5c40a SHA512 8b46472184f2eab1aeca5de9b957a87f475f5acd9801260678b07475cf36afb1a9602e67ef39ad59da90d2d6cee235521db95d93349fd9bd6cee667eab2e5d32
+EBUILD links-2.26-r1.ebuild 3552 BLAKE2B 41a6b252f696efd996771500133bce15e50bdb2727e954672ce450268a71fc100a5fe15f61c444df686d80b16c300d099e281e0f7341a17e8721b3818090f767 SHA512 206178c756db79668c9cba4e7107014a2f98b3c57c87b2ca6a48b8ccb136be3aa06e9ea6c3c3da1a8274056d9106298f6de6fc5205e3373e2bc9b606c6a0043c
+EBUILD links-2.27.ebuild 3560 BLAKE2B 19a6720ac267ee91584f11ac17e8126de4a05224e5d1cdcfac4204a5121ba60a44ab299fdc67722a4eb3e311e72dfcf8577f053e616f0a0775105fb0539c0120 SHA512 9a53cbc43159c9d256ca194585d0a93bf9eea880c077e9a8fefa87deacb8134adbcb5fc190f8b2c492b2fcd744a0c290d7309fc7daf50db2d065f64e92b32cdf
 MISC metadata.xml 672 BLAKE2B 5d282c043806b3ce47853e39f6fdee47b4223f0f02eae009124e9e0d9aee81e3f3c4135d27f733b9468760848499233763cd798f74f4ad751e345a6c67e355bb SHA512 198f8bf38632bc4348f8c50f8655dc6575db217ee307dcc8674822bec94c2ee904d650c4ee56a233629165f7085cb1b71eb1267d68b782a67fc88497116fa85b
diff --git a/www-client/links/links-2.25-r3.ebuild b/www-client/links/links-2.25-r3.ebuild
deleted file mode 100644
index f5dafcb468ad..000000000000
--- a/www-client/links/links-2.25-r3.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
-HOMEPAGE="http://links.twibright.com/"
-SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
-
-GRAPHICS_DEPEND="media-libs/libpng:0="
-
-RDEPEND="
-	dev-libs/libbsd
-	brotli? (
-		app-arch/brotli
-	)
-	bzip2? (
-		app-arch/bzip2
-	)
-	fbcon? (
-		${GRAPHICS_DEPEND}
-	)
-	freetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	gpm? (
-		sys-libs/gpm
-	)
-	jpeg? (
-		virtual/jpeg:0
-	)
-	libevent? (
-		dev-libs/libevent:0=
-	)
-	livecd? (
-		${GRAPHICS_DEPEND}
-		sys-libs/gpm
-		virtual/jpeg:0
-	)
-	lzip? (
-		app-arch/lzip
-	)
-	lzma? (
-		app-arch/xz-utils
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	svga? (
-		${GRAPHICS_DEPEND}
-		media-libs/svgalib
-	)
-	tiff? (
-		media-libs/tiff:0
-	)
-	X? (
-		${GRAPHICS_DEPEND}
-		x11-libs/libXext
-	)
-	zlib? (
-		sys-libs/zlib
-	)
-	zstd? (
-		app-arch/zstd
-	)"
-
-DEPEND="${RDEPEND}
-	fbcon? ( virtual/os-headers )
-	livecd? ( virtual/os-headers )"
-
-BDEPEND="virtual/pkgconfig"
-
-IDEPEND="X? ( dev-util/desktop-file-utils )"
-
-REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
-	svga? ( suid )"
-
-DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
-
-src_prepare() {
-	use X && xdg_environment_reset
-
-	if use unicode; then
-		pushd intl > /dev/null || die
-		./gen-intl || die
-		./synclang || die
-		popd > /dev/null || die
-	fi
-
-	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
-	sed -i \
-		-e '/AC_PROG_CXX/s:dnl ::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.in || die #467020
-
-	# Upstream configure produced by broken autoconf-2.13. This also fixes
-	# toolchain detection.
-	mv configure.in configure.ac || die
-
-	default
-	eautoreconf #131440 and #103483#c23
-}
-
-src_configure() {
-	local myconf
-
-	if use livecd; then
-		export ac_cv_lib_gpm_Gpm_Open=yes
-		myconf+=' --with-fb --with-libjpeg'
-	else
-		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
-	fi
-
-	if use X || use fbcon || use svga || use livecd; then
-		myconf+=' --enable-graphics'
-	fi
-
-	tc-export PKG_CONFIG
-
-	econf \
-		--without-directfb \
-		--without-librsvg \
-		$(use_with brotli) \
-		$(use_with bzip2) \
-		$(use_with fbcon fb) \
-		$(use_with freetype) \
-		$(use_with ipv6) \
-		$(use_with jpeg libjpeg) \
-		$(use_with libevent) \
-		$(use_with lzip) \
-		$(use_with lzma) \
-		$(use_with ssl) \
-		$(use_with svga svgalib) \
-		$(use_with tiff libtiff) \
-		$(use_with X x) \
-		$(use_with zlib) \
-		$(use_with zstd) \
-		${myconf}
-}
-
-src_install() {
-	HTML_DOCS="doc/links_cal/*"
-	default
-
-	if use X; then
-		newicon Links_logo.png links.png
-		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
-		local d="${ED}"/usr/share/applications
-		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
-		if use ssl; then
-			sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
-			"${d}"/*.desktop || die
-		fi
-	fi
-
-	use suid && fperms 4755 /usr/bin/links
-}
-
-pkg_postinst() {
-	use X && xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	use X && xdg_desktop_database_update
-}
diff --git a/www-client/links/links-2.26-r1.ebuild b/www-client/links/links-2.26-r1.ebuild
index 854a8bea7f8e..1485b6630a67 100644
--- a/www-client/links/links-2.26-r1.ebuild
+++ b/www-client/links/links-2.26-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode webp X zlib zstd"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/links/links-2.26.ebuild b/www-client/links/links-2.27.ebuild
index cd2e60dc5f94..037b3c189417 100644
--- a/www-client/links/links-2.26.ebuild
+++ b/www-client/links/links-2.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode webp X zlib zstd"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
@@ -35,7 +35,7 @@ RDEPEND="
 		sys-libs/gpm
 	)
 	jpeg? (
-		virtual/jpeg:0
+		media-libs/libjpeg-turbo:=
 	)
 	libevent? (
 		dev-libs/libevent:0=
@@ -43,7 +43,7 @@ RDEPEND="
 	livecd? (
 		${GRAPHICS_DEPEND}
 		sys-libs/gpm
-		virtual/jpeg:0
+		media-libs/libjpeg-turbo:=
 	)
 	lzip? (
 		app-arch/lzip