4 files changed, 2 insertions, 376 deletions
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 0ca5f8cafae5..80c44ca8d522 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,3 +1,2 @@
-DIST links-2.29.tar.bz2 6521024 BLAKE2B 6ae2b0e4a4a314756ef74ca19888e4c8a9e89347767475000f4b3ea70eb7157430bb5a6721108585c122eb33f6b05ab5eab600e26c9e1d2b8bdafd85483c6d94 SHA512 5ea8b2fd0eb74d9dc2b45614aef6ee878fe686dff9bcee75ac6ea01f6a7331670f7709233d31986fc64ad86ce549616a4471057837b6caf15af6d1c5c503ac75
 DIST links-2.30.tar.bz2 6569493 BLAKE2B f08ea1228e067034d790f4eaaf90d5e1c8b3d22f80bf598ac840590f1045cab9be40e24b78f8a32c9cb09bfc59f22f53b93ba817e000e2811b38601baf6d8601 SHA512 265f71fcd80a160b48b9572c4ca326c26a45032fbca69be3f3b6e60af136152daa22884e097ef719db950607425eb0e8c7f8714047f2476000301fd2b76c3806
 DIST links-graphics-xlinks-logo-pic.png 6041 BLAKE2B dfa6c036eaeca66a4aabd909b3b5eb61dd9a4079ab236a2d65ca1756d1110319913849569cad19e59ca4ae2413f518d0613588b58c81b718d718a61f072f2e52 SHA512 563ba62e1172e86ae6911ea743ecb1faef1a8739c30c50355b6f12669aa91aa6fefb284ed049dc9b81537b2e9950ef501453ebfcd82ad284536d20a08e97ff36
diff --git a/www-client/links/links-2.29-r1.ebuild b/www-client/links/links-2.29-r1.ebuild
deleted file mode 100644
index 6ff1c20f1276..000000000000
--- a/www-client/links/links-2.29-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2025 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
-	X? ( https://dashboard.snapcraft.io/site_media/appmedia/2018/07/links-graphics-xlinks-logo-pic.png )"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="avif brotli bzip2 fbcon freetype gpm jpeg libevent livecd lzip lzma selinux ssl suid svga tiff webp X zlib zstd"
-
-GRAPHICS_DEPEND="media-libs/libpng:="
-
-# libbsd: #931216
-RDEPEND="
-	!elibc_Darwin? ( dev-libs/libbsd )
-	avif? (
-		media-libs/libavif:=
-	)
-	brotli? (
-		app-arch/brotli:=
-	)
-	bzip2? (
-		app-arch/bzip2
-	)
-	fbcon? (
-		${GRAPHICS_DEPEND}
-	)
-	freetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	gpm? (
-		sys-libs/gpm
-	)
-	jpeg? (
-		media-libs/libjpeg-turbo:=
-	)
-	libevent? (
-		dev-libs/libevent:=
-	)
-	livecd? (
-		${GRAPHICS_DEPEND}
-		sys-libs/gpm
-		media-libs/libjpeg-turbo:=
-	)
-	lzip? (
-		app-arch/lzlib
-	)
-	lzma? (
-		app-arch/xz-utils
-	)
-	ssl? (
-		dev-libs/openssl:=
-	)
-	svga? (
-		${GRAPHICS_DEPEND}
-		media-libs/svgalib
-	)
-	tiff? (
-		media-libs/tiff:=
-	)
-	webp? (
-		media-libs/libwebp:=
-	)
-	X? (
-		${GRAPHICS_DEPEND}
-		x11-libs/libX11
-	)
-	zlib? (
-		virtual/zlib:=
-	)
-	zstd? (
-		app-arch/zstd:=
-	)"
-
-DEPEND="${RDEPEND}
-	fbcon? ( virtual/os-headers )
-	livecd? ( virtual/os-headers )
-	X? ( x11-base/xorg-proto )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-IDEPEND="X? ( dev-util/desktop-file-utils )"
-
-RDEPEND+=" selinux? ( sec-policy/selinux-links )"
-
-REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
-	svga? ( suid )"
-
-DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
-
-PATCHES=( "${FILESDIR}/links-2.29-fix-zstd-only-build.patch" )
-
-src_prepare() {
-	use X && xdg_environment_reset
-
-	pushd intl > /dev/null || die
-	./gen-intl || die
-	./synclang || die
-	popd > /dev/null || die
-
-	# 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 \
-		--with-ipv6 \
-		$(use_with avif libavif) \
-		$(use_with brotli) \
-		$(use_with bzip2) \
-		$(use_with fbcon fb) \
-		$(use_with freetype) \
-		$(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 webp libwebp) \
-		$(use_with X x) \
-		$(use_with zlib) \
-		$(use_with zstd) \
-		${myconf}
-}
-
-src_install() {
-	HTML_DOCS="doc/links_cal/*"
-	default
-
-	if use X; then
-		newicon "${DISTDIR}"/links-graphics-xlinks-logo-pic.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.30-r1.ebuild b/www-client/links/links-2.30-r2.ebuild
index 6108f56d3b10..0ccb3dffce34 100644
--- a/www-client/links/links-2.30-r1.ebuild
+++ b/www-client/links/links-2.30-r2.ebuild
@@ -160,7 +160,8 @@ src_install() {
 
 	if use X; then
 		newicon "${DISTDIR}"/links-graphics-xlinks-logo-pic.png links.png
-		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		make_desktop_entry --eapi9 "links" -a "-g %u" -n "Links" \
+			-i "links" -c 'Network;WebBrowser'
 		local d="${ED}"/usr/share/applications
 		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
 		if use ssl; then
diff --git a/www-client/links/links-2.30.ebuild b/www-client/links/links-2.30.ebuild
deleted file mode 100644
index 6ff1c20f1276..000000000000
--- a/www-client/links/links-2.30.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2025 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
-	X? ( https://dashboard.snapcraft.io/site_media/appmedia/2018/07/links-graphics-xlinks-logo-pic.png )"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="avif brotli bzip2 fbcon freetype gpm jpeg libevent livecd lzip lzma selinux ssl suid svga tiff webp X zlib zstd"
-
-GRAPHICS_DEPEND="media-libs/libpng:="
-
-# libbsd: #931216
-RDEPEND="
-	!elibc_Darwin? ( dev-libs/libbsd )
-	avif? (
-		media-libs/libavif:=
-	)
-	brotli? (
-		app-arch/brotli:=
-	)
-	bzip2? (
-		app-arch/bzip2
-	)
-	fbcon? (
-		${GRAPHICS_DEPEND}
-	)
-	freetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	gpm? (
-		sys-libs/gpm
-	)
-	jpeg? (
-		media-libs/libjpeg-turbo:=
-	)
-	libevent? (
-		dev-libs/libevent:=
-	)
-	livecd? (
-		${GRAPHICS_DEPEND}
-		sys-libs/gpm
-		media-libs/libjpeg-turbo:=
-	)
-	lzip? (
-		app-arch/lzlib
-	)
-	lzma? (
-		app-arch/xz-utils
-	)
-	ssl? (
-		dev-libs/openssl:=
-	)
-	svga? (
-		${GRAPHICS_DEPEND}
-		media-libs/svgalib
-	)
-	tiff? (
-		media-libs/tiff:=
-	)
-	webp? (
-		media-libs/libwebp:=
-	)
-	X? (
-		${GRAPHICS_DEPEND}
-		x11-libs/libX11
-	)
-	zlib? (
-		virtual/zlib:=
-	)
-	zstd? (
-		app-arch/zstd:=
-	)"
-
-DEPEND="${RDEPEND}
-	fbcon? ( virtual/os-headers )
-	livecd? ( virtual/os-headers )
-	X? ( x11-base/xorg-proto )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-IDEPEND="X? ( dev-util/desktop-file-utils )"
-
-RDEPEND+=" selinux? ( sec-policy/selinux-links )"
-
-REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
-	svga? ( suid )"
-
-DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
-
-PATCHES=( "${FILESDIR}/links-2.29-fix-zstd-only-build.patch" )
-
-src_prepare() {
-	use X && xdg_environment_reset
-
-	pushd intl > /dev/null || die
-	./gen-intl || die
-	./synclang || die
-	popd > /dev/null || die
-
-	# 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 \
-		--with-ipv6 \
-		$(use_with avif libavif) \
-		$(use_with brotli) \
-		$(use_with bzip2) \
-		$(use_with fbcon fb) \
-		$(use_with freetype) \
-		$(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 webp libwebp) \
-		$(use_with X x) \
-		$(use_with zlib) \
-		$(use_with zstd) \
-		${myconf}
-}
-
-src_install() {
-	HTML_DOCS="doc/links_cal/*"
-	default
-
-	if use X; then
-		newicon "${DISTDIR}"/links-graphics-xlinks-logo-pic.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
-}