gentoo resync : 13.11.2021

3 files changed, 2 insertions, 171 deletions

diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 462d0e39a60f..3283bdae87e2 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,7 +1,5 @@
-DIST links-2.23.tar.bz2 6521143 BLAKE2B baefdadddc0d44511488ca1a085a45f3235b9c58ae6013c1efce495a33e86b96575eba6a15df4f14ea82b7d1ffb69ea312d5d5223ba9c605709bdb5d153ef6cb SHA512 3c233dab2e7e5ca72f582c5af9c5799b3d6c1a5a64d4e9e0209f78f347a245dc760c2340f71839fd42e1c9f358599b8baa12aa024938f2ab1b6424c8fb0b9a7d
 DIST links-2.24.tar.bz2 6470666 BLAKE2B f6ae42f64283e250afc2041efbb1d8680ef860ea83d0592f9f92bb90a2c2a23e470cc6be4a8538bcbed5162bfb42be30336ac48b7d19e1b4b79c64deb9073f55 SHA512 093e24d8504faf95fa9e6ce50b4e6b01284995fa8ee156b5c8b2b52b4ca3bdbcdf95965c8f9c8b72adcfbedf8a5216467c85c122778381c3b148f5696b709fd1
 DIST links-2.25.tar.bz2 6505187 BLAKE2B 3efe9d43b9a8dad498101800ccdefd094a6371a2c74b264aaaaac2abf951db38729abcf00f74a45fdb7f0d24196413996aa02cd9d2ea3ee2cf008faf4062e365 SHA512 b094e3b2096b07da8385d6021e5a5794f5b602c90ec824c48b897e6b69def6d69cb879af3008a4af43effaa7d9359bf09e4feb8ed5371bb7ff22ffcb0794f690
-EBUILD links-2.23.ebuild 3376 BLAKE2B 9aa58d0dbd41479bbf9865d4646a2c8aeb2b13748547cc41655a4a7c34ca1da76f430061c20997d4d7f74855d585cdb72eaba988cba3fc35027e0b58bb4ed656 SHA512 48bb0f21478f61488821e49a7ccd4fd52844808a9c22fb252f5af766490af6f75a95f3ede0caaeafae39d1794e2194075d7992f90a5c4aa7ee5d4eb67be4188a
 EBUILD links-2.24.ebuild 3396 BLAKE2B ff1a0b878fd0409224e7e22a4d1570ba5451cb47dde0083255ca9e44694d5a41d1617a1e90c2620b7bdfdb94f9cbd2d0e36d06cb8188350b1b30f98b42a36e46 SHA512 54573e64fd2ff9200ce650083ca2411b03525e0c7eed84034316cf4b050e536f4d92ef3e0905baeeabfb5b70ba4fc8f21fa6de9a5b5a01a2401a237fdc937227
-EBUILD links-2.25.ebuild 3404 BLAKE2B 50ca2c575d8e94cb526b33134734a6e4ea17ae2bca2a022300e0be6c4fc7fe0c9aff5eaabee770a86bd6eab783124ee90a93ed5346b1ffc01e702289ac10200f SHA512 6863e084013309e586f19e491fea60d4d090f2c833923b9e3fbd0a7d9b2c2e07c59b310d3956696b087270b29be5c10a7a4581f5b875f31461ea8dde9052c822
+EBUILD links-2.25-r1.ebuild 3421 BLAKE2B a1de9e0b5a23f63a8537267f2ec93e5e6f3e4c8b39e5773e2252b8dd5070402cd08610deb2a6b9b4780d4443d6bc95df4fc19936cfa5ef297fc3c27b4d87f583 SHA512 f4f5c21a55d0624566a9110c2f6d88f0c9f29cb4bdcb36c730c5e8962120234eead192eb5ebc535d093064ffa318f173500e360e1ffdfa6bcbfec68d4b96440b
 MISC metadata.xml 672 BLAKE2B 5d282c043806b3ce47853e39f6fdee47b4223f0f02eae009124e9e0d9aee81e3f3c4135d27f733b9468760848499233763cd798f74f4ad751e345a6c67e355bb SHA512 198f8bf38632bc4348f8c50f8655dc6575db217ee307dcc8674822bec94c2ee904d650c4ee56a233629165f7085cb1b71eb1267d68b782a67fc88497116fa85b
diff --git a/www-client/links/links-2.23.ebuild b/www-client/links/links-2.23.ebuild
deleted file mode 100644
index 1eec8e133e69..000000000000
--- a/www-client/links/links-2.23.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop 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="
-	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}
-	virtual/pkgconfig
-	fbcon? ( virtual/os-headers )
-	livecd? ( virtual/os-headers )
-	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
-
-	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.25.ebuild b/www-client/links/links-2.25-r1.ebuild
index 59c9f75ec2ed..b9ea020b62ea 100644
--- a/www-client/links/links-2.25.ebuild
+++ b/www-client/links/links-2.25-r1.ebuild
@@ -17,6 +17,7 @@ IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl su
 GRAPHICS_DEPEND="media-libs/libpng:0="
 
 RDEPEND="
+	dev-libs/libbsd
 	brotli? (
 		app-arch/brotli
 	)