gentoo resync : 28.04.2021

4 files changed, 2 insertions, 202 deletions

diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 2e09f43831d0..b05ca4d999cc 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,6 +1,3 @@
-AUX swap-echo-for-printf.patch 898 BLAKE2B a96020c7522ee0940e9371c82c6b323aeccbdb102599f04002bb1f55e2a81412a57fa59c313509f0b6e9faff498421d5208d41c8e53e68165df1778ac9757006 SHA512 83c8586ab4c335dbe8eaa7bdd0608336b954e66db7b87a6bffd07cec9a54c75b7451bd84f2e6d22f251442adf38e0c1cff98e754172f7f9d38ed3f166da518b7
-DIST links-2.21.tar.bz2 6491465 BLAKE2B a60d2fbd252b97ead45e451c1d1d16204a23e618a59016c6b46a56b7c2f96189d3d7f71e9d647f188824ad7e7c36fd8d62dac3c7125eb9cf833591a6ce3206e6 SHA512 11fd523d0aa102d8160957bdbd36674a621aeb2e33237f0df35dcc3fad92ec288acd31dc2e7542717406047165f1249d68972c77cdb27fda076645636a056da8
 DIST links-2.22.tar.bz2 6481705 BLAKE2B a6855fcc62377116fe61adb01623c0cd757ee47ae36bfb35ae657a6d6587f9e47b6b1f78ad73e3fca911ad4aee8c15f364d4af911d694f04229b107d10d6f422 SHA512 d2c9f764d64c2d73b85c998db9fc8c241556977380eef1f4041623ca306f5798227b2b57daecf09ee85e0b07f8738bdfe0b84fefc924d6e05d931e29d29ba40e
-EBUILD links-2.21.ebuild 3491 BLAKE2B f95d934992e1f5ccc13d50b83a19cc1af845d6bc0813c595e4cc3b62cca05a632f556771bf9eb98eba7858c875059585f8bc5f491821359718fea17acf8cc7f2 SHA512 03615b9eda63f9a70fd52233a6d6634049e2bf909bf7d5f844b278571926cb5176fd2ae4c01a736a5aff559ade0ce6adf371ee9cf41553e779ec716ec5a7d371
-EBUILD links-2.22.ebuild 3445 BLAKE2B 0d19c955880f7351a188da6035862735cc4fa7c455c9f224561bc17271bba46c2fe291eb4a3f39ddd0f1c6caa8d391a0ad88cac26fd38101ae25393941723ef6 SHA512 c9fd02977465f4865345fb001661b139e13575cfa21febf8500a1a72eec26842b737468a6917426ffb599c6705176aed94c5359618b99a549176464b75c78590
+EBUILD links-2.22.ebuild 3438 BLAKE2B c14f067ac6657f06d6472ea73db5eb420189cd7ade252cf1dccd4b2d52ef5d3e68f6f8ee9e28816600f8b4fd1cb2c3721473128c118893799e62d46eac4afc94 SHA512 5a8bddf14c17c55a792aad9fe55ffa224bc109c455b91ac112156b75b669f01dee0e771be5763937c4d15959777e0710c38911a572fa481e6143a9be567556c1
 MISC metadata.xml 671 BLAKE2B a27e4d153f5b73c96a6e15b21306a3d47c1df9cc9492b115d58ddcf3af8ba8b7c5b51b985c32b31fd04e88b400022f1db873063fab519792aa18c67538f0b790 SHA512 6913a9c3b54ac53235f85ef4a4ba8c370b7ffa4fd429e2a3d1a065eab96ba5e36f35b704622c9599585cdcbad43e14783ef92934c0e250bc315a3d9754aac360
diff --git a/www-client/links/files/swap-echo-for-printf.patch b/www-client/links/files/swap-echo-for-printf.patch
deleted file mode 100644
index 9681a624ed2b..000000000000
--- a/www-client/links/files/swap-echo-for-printf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-"echo -n" is not POSIX compliant but printf is.
-See "man 1p echo" section "APPLICATION USAGE" or visit
-https://www.in-ulm.de/%7Emascheck/various/echo+printf/
-
---- a/intl/synclang.orig	2020-06-03 19:13:38.082539276 -0000
-+++ b/intl/synclang	2020-06-03 19:13:59.122352023 -0000
-@@ -6,7 +6,7 @@
- if [ -n "$languages" ]; then
- 	for i in $languages; do
- 		if [ "$i" != english ]; then
--			echo -n $i" " 1>&2
-+			printf '%s ' "$i" 1>&2
- 			awk -f synclang.awk <$i.lng | sed 's/
//g' >_sync.tmp
- 			mv $i.lng ../intl-bak/$i.lng.bak
- 			mv _sync.tmp $i.lng
---- a/intl/gen-intl.orig	2020-06-03 19:14:37.258679373 -0000
-+++ b/intl/gen-intl	2020-06-03 19:14:47.651920249 -0000
-@@ -10,7 +10,7 @@
- n=0
- echo '/* Automatically generated by gen-intl */'
- for i in $languages; do
--	echo -n $i" " 1>&2
-+	printf '%s ' "$i" 1>&2
- 	if test `cat $i.lng|wc -l` != `cat english.lng|wc -l`; then
- 		echo 1>&2
- 		echo 1>&2
diff --git a/www-client/links/links-2.21.ebuild b/www-client/links/links-2.21.ebuild
deleted file mode 100644
index 296aa5e67378..000000000000
--- a/www-client/links/links-2.21.ebuild
+++ /dev/null
@@ -1,171 +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 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.22.ebuild b/www-client/links/links-2.22.ebuild
index bee0327268dd..a3bb7a4d9c4e 100644
--- a/www-client/links/links-2.22.ebuild
+++ b/www-client/links/links-2.22.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 ~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 libressl livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="