4 files changed, 2 insertions, 346 deletions
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 23587b4fb862..601c126523d3 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,7 +1,4 @@
 AUX swap-echo-for-printf.patch 898 BLAKE2B a96020c7522ee0940e9371c82c6b323aeccbdb102599f04002bb1f55e2a81412a57fa59c313509f0b6e9faff498421d5208d41c8e53e68165df1778ac9757006 SHA512 83c8586ab4c335dbe8eaa7bdd0608336b954e66db7b87a6bffd07cec9a54c75b7451bd84f2e6d22f251442adf38e0c1cff98e754172f7f9d38ed3f166da518b7
-DIST links-2.20.2.tar.bz2 6474383 BLAKE2B c69c421a85114b3dc0d7f2b37ce5454655b426ea9463c80e4a826f02374c0740d963251b4e9ed6c960dcad15403511c33f3a2e199a728e8f5425a359963bd102 SHA512 82be459856f49f45c9b824589b78c0f58b039b09802e077420053e9449bc1ded272bb8ad57ea10522d8b3305ceb212a5dd08b01052538cd5b4f0447d0ba02152
 DIST links-2.21.tar.bz2 6491465 BLAKE2B a60d2fbd252b97ead45e451c1d1d16204a23e618a59016c6b46a56b7c2f96189d3d7f71e9d647f188824ad7e7c36fd8d62dac3c7125eb9cf833591a6ce3206e6 SHA512 11fd523d0aa102d8160957bdbd36674a621aeb2e33237f0df35dcc3fad92ec288acd31dc2e7542717406047165f1249d68972c77cdb27fda076645636a056da8
-EBUILD links-2.20.2-r1.ebuild 3523 BLAKE2B c274db743c6eb206a7576800b5a86d60568d456488b550b6b1977844fd4ec9768e423af9c2ecefca7c75508021289a6c948a819eae7766f5af30d75090d861b9 SHA512 1994bd36ddfa75cb55b093acb0bb3b36b282634c1f65842c4bcc9a64d76c295ae988fb714a5ea278661b898d2509f5b39f98c421c10c663c1b1db81c5e1eab5c
-EBUILD links-2.20.2.ebuild 3414 BLAKE2B 1cb7231e2c4b73d134f0e4109b57d340311e32196c3cefd8f2fd50bea8af94f18946bfb3bfbb510e05d94ec122bd06070b35ef38525645665bd29c9720dae013 SHA512 7c493d283ec1a272b8f85e8bfc60c68f1e501aac5507882626effa974904de8aa8bccc3f87d71516ebf202e29257ba6c0cfb7d95663fb13696d4a648a6c5234a
-EBUILD links-2.21.ebuild 3521 BLAKE2B ffe9e1eeeca13c18b4cc13b35b94e512e77c719a49e9b4b9616f8624db221f7681bda7ec4d0c0d85f995e5a4ce10072c3d073b223d04fa21dd6cb04bf87e1e3b SHA512 fe080499cf28d1ef860a486a523a93e2e45baf9cda650ca282e5ab6e009d73e05dfc7e864660811961fae66440975c9b175479e9241d624ad104c7edad6266f5
+EBUILD links-2.21.ebuild 3502 BLAKE2B 7ec6a93470ab9d128686be953c18f2efd7015a1e6319d94fe85dfe80cf71941f0f87f83669c4f8058b494aa692f7b5df0fbf20f425f5e621f44182d2c2b64317 SHA512 e611512fe38bae1343d7a6376932063f36e79a91142525d198dafb9c76e74bd6605245d82a5411dfdcd86e85bc31c55c14d783cd5cb7efe0649d98784ea43f3e
 MISC metadata.xml 671 BLAKE2B a27e4d153f5b73c96a6e15b21306a3d47c1df9cc9492b115d58ddcf3af8ba8b7c5b51b985c32b31fd04e88b400022f1db873063fab519792aa18c67538f0b790 SHA512 6913a9c3b54ac53235f85ef4a4ba8c370b7ffa4fd429e2a3d1a065eab96ba5e36f35b704622c9599585cdcbad43e14783ef92934c0e250bc315a3d9754aac360
diff --git a/www-client/links/links-2.20.2-r1.ebuild b/www-client/links/links-2.20.2-r1.ebuild
deleted file mode 100644
index 0c528094f163..000000000000
--- a/www-client/links/links-2.20.2-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2020 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 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl 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? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl: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 )
-
-PATCHES=( "${FILESDIR}/swap-echo-for-printf.patch" )
-
-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.20.2.ebuild b/www-client/links/links-2.20.2.ebuild
deleted file mode 100644
index 73c6ea3e019c..000000000000
--- a/www-client/links/links-2.20.2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop xdg
-
-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 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl 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? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl: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 )"
-
-REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
-	svga? ( suid )"
-
-DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
-
-src_prepare() {
-	xdg_src_prepare
-
-	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
-	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_preinst() {
-	use X && xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}
diff --git a/www-client/links/links-2.21.ebuild b/www-client/links/links-2.21.ebuild
index 6d23dac483b0..21f10bc4e758 100644
--- a/www-client/links/links-2.21.ebuild
+++ b/www-client/links/links-2.21.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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="