Merge updates from master

25 files changed, 277 insertions, 11 deletions

diff --git a/app-text/discount/files/gethopt-undefined.patch b/app-text/discount/files/gethopt-undefined.patch
deleted file mode 100644
index b74e2e79bc1a..000000000000
--- a/app-text/discount/files/gethopt-undefined.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -139,7 +139,7 @@
- 
- pandoc_headers.o: tools/pandoc_headers.c config.h
- 	$(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c
--pandoc_headers: pandoc_headers.o
-+pandoc_headers: pandoc_headers.o $(MKDLIB) $(COMMON)
- 	$(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown 
- 
- branch.o: tools/branch.c config.h
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild
index aaaf23f83793..37e3828ead37 100644
--- a/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild
+++ b/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild
index aaaf23f83793..37e3828ead37 100644
--- a/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild
+++ b/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
index b296e44eae5c..5b7624cd297c 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild
index b296e44eae5c..5b7624cd297c 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild
index bace515df399..32ac344a514e 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild
index bace515df399..32ac344a514e 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
index edf7eaf4cf37..4d4e95e9196c 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild
index edf7eaf4cf37..4d4e95e9196c 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
index 317f27754a58..591aebc7cf5b 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild
index 317f27754a58..591aebc7cf5b 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
index 53095e2d7956..e80a110a2894 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 inherit readme.gentoo-r1 distutils-r1
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.5.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.5.0.ebuild
index 7bf98bc994af..e3fdf6bc561c 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.5.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 inherit readme.gentoo-r1 distutils-r1
 
@@ -34,6 +35,7 @@ BDEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 511a5ed0a21b..3c8df2e78a33 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 git-r3 distutils-r1
@@ -30,6 +31,7 @@ BDEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
index 0bd0ca928a28..b67bfb3e65bf 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild
index 0bd0ca928a28..b67bfb3e65bf 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
index c63f1d6ffe14..7834a034d6b5 100644
--- a/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild
index c63f1d6ffe14..7834a034d6b5 100644
--- a/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot/buildbot-3.4.0.ebuild b/dev-util/buildbot/buildbot-3.4.0.ebuild
index 38255fa6053e..da16ccd719c4 100644
--- a/dev-util/buildbot/buildbot-3.4.0.ebuild
+++ b/dev-util/buildbot/buildbot-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit readme.gentoo-r1 systemd distutils-r1
diff --git a/dev-util/buildbot/buildbot-3.5.0.ebuild b/dev-util/buildbot/buildbot-3.5.0.ebuild
index 5157b8bb6383..eb038ad1f925 100644
--- a/dev-util/buildbot/buildbot-3.5.0.ebuild
+++ b/dev-util/buildbot/buildbot-3.5.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit readme.gentoo-r1 systemd distutils-r1
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index bc6e6f1f0996..4b1b1de3957d 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index f53d028c839d..f461e39056ea 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -1 +1,2 @@
 DIST tinyproxy-1.11.0.tar.xz 177664 BLAKE2B 6ea74ef0fff22fbc6e04b37519151fda771a7d3e789d94cbd2a77a76dce7b16151cfbad83ac665a5c1fdb7334cd4d26ed6d2bc73f70b3858ffe439b16698fd2e SHA512 c0ff2a90da2352e6021efc87d1293b85f2a7588b2a1ab13bd96d906382eda8188b22b01f9acb2d200fd570bf3ec9484fa370cae6834d1f055c0af1631d22ae9d
+DIST tinyproxy-1.11.1.tar.xz 182080 BLAKE2B d39fa1986343af60cdfd07c6a049962e646a72874f7058fd082b9758bae3c7bc1a2288103527e0e1054ab098a3a41fc67eb3e08cd160e2bd4bd030e114326a6f SHA512 2e3435bbfece3797c11ccce222eef494ed92e00dd82bea2c40a54e454b7e03c8abc8e09b244f2da7192209c39047369439d08974b79eebc996fb3095230d0374
diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.1.ebuild
new file mode 100644
index 000000000000..6c987419d72d
--- /dev/null
+++ b/net-proxy/tinyproxy/tinyproxy-1.11.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd tmpfiles
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A lightweight HTTP/SSL proxy"
+HOMEPAGE="https://github.com/tinyproxy/tinyproxy/"
+SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
++upstream-proxy +xtinyproxy-header"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( xtinyproxy-header )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DEPEND="
+	acct-group/tinyproxy
+	acct-user/tinyproxy
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s|nobody|${PN}|g" \
+		etc/${PN}.conf.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable filter-proxy filter) \
+		$(use_enable reverse-proxy reverse) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable upstream-proxy upstream) \
+		$(use_enable xtinyproxy-header xtinyproxy) \
+		--localstatedir=/var
+}
+
+src_test() {
+	# The make check target does not run the test suite
+	emake test
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	diropts -m0775 -o ${PN} -g ${PN}
+	keepdir /var/log/${PN}
+
+	newinitd "${FILESDIR}"/${PN}-1.10.0.initd tinyproxy
+	systemd_newunit "${FILESDIR}"/${PN}-1.10.0.service tinyproxy.service
+	dotmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.tmpfiles.conf
+
+	elog "For filtering domains and URLs, enable filter option in the configuration"
+	elog "file and add them to the filter file (one domain or URL per line)."
+}
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index c2e2908d5633..f842f9ca45c6 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1 +1,2 @@
 DIST links-2.26.tar.bz2 6508447 BLAKE2B e0bf5ac4e05a8e14ae7342aed7bb7ac0f5f6c2d9e23adda221cc3ba73f39020c95cef90d10d5c9d0697797683ff1edf1ed55a4d8aca0930b2eb01b547a21bf00 SHA512 b732f88ae0e9f63f577fc3041058c56b43ffec3b797328453d0770e326010b05fcc04128287ef35b0d189bd0768446057d8773e10f8e0a76bab72fb252cdd530
+DIST links-2.27.tar.bz2 6510121 BLAKE2B c7326147c583ad380f1b528a216ecf056a40a2939b290d69061682aa9f397ab3eabb71691cb68efcd0739b67acbe1f38f95a8a347d5045efe671eacfd0e5c40a SHA512 8b46472184f2eab1aeca5de9b957a87f475f5acd9801260678b07475cf36afb1a9602e67ef39ad59da90d2d6cee235521db95d93349fd9bd6cee667eab2e5d32
diff --git a/www-client/links/links-2.27.ebuild b/www-client/links/links-2.27.ebuild
new file mode 100644
index 000000000000..037b3c189417
--- /dev/null
+++ b/www-client/links/links-2.27.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 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 ~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="
+
+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? (
+		media-libs/libjpeg-turbo:=
+	)
+	libevent? (
+		dev-libs/libevent:0=
+	)
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		media-libs/libjpeg-turbo:=
+	)
+	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
+	)
+	webp? (
+		media-libs/libwebp:=
+	)
+	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 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 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
+}