[gentoo-commits] repo/gentoo:master commit in: www-client/links/

[Ben Kohler]

commit:     c7a3f6c8c3ef3cd7063a02908dbe96faf89612d3
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 19:23:02 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 19:23:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a3f6c8

www-client/links: bump to 2.20.2

Add a few new flags for optional deps

Closes: https://bugs.gentoo.org/657996
Bug: https://bugs.gentoo.org/694016
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 www-client/links/Manifest            |   1 +
 www-client/links/links-2.20.2.ebuild | 170 +++++++++++++++++++++++++++++++++++
 www-client/links/metadata.xml        |   7 ++
 3 files changed, 178 insertions(+)

diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 3bdf7223be5..ef00e4c9fd6 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -2,3 +2,4 @@ DIST links-2.14.tar.bz2 6535707 BLAKE2B e0a2f804e05fde94be50ee2dce1453c0c616aac2
 DIST links-2.16.tar.bz2 6697222 BLAKE2B dba0f00acf14e7994d3eeea7f77df897941690d959c2aa90924bb1256f310a6ddc969e2dc7ca8ca775f2ec06acebbabb30b35088a9cc6100b01f7fa6dfaeaaa8 SHA512 3ce169e214eae0f997c1f8647d354dc0803c9118a97dcd2594d62af23336890272f4b027d3ab0a0e151672d1506e50da0f0e561999c5841f0f183f32a279b14a
 DIST links-2.17.tar.bz2 6694577 BLAKE2B a762dd810d8d939c3276ca13ed8460cc486d275e3436015440527fdbe16adc29ccf4ff26c59de2354c50cab5fbc6ce72d4b94cc6e731e4295f86f892eaf0af64 SHA512 871a3a2cbc210467f4ffd830ba2966f2ebc0ec9ed4a1de018d032cec4b550e58f6858875478647c627ec746bb76810a4b97603575f2d21b5ea650c612684c8d5
 DIST links-2.18.tar.bz2 6703625 BLAKE2B 7fabfe805e5701bf254c7088da22f03125debfe764815b649a5533bd53ae6b61195c7005391140673baa2aa87f356e8134042f78404b6abbc4ce560ec75d7085 SHA512 fef25d90985663c64ab04d6b6ef445ef2ac80c8b297897ff23b7d798c0607b90c86432f1a6fc4f02d1b1e61fe934cd01cd554c5765500248e8481f5cfa71da51
+DIST links-2.20.2.tar.bz2 6474383 BLAKE2B c69c421a85114b3dc0d7f2b37ce5454655b426ea9463c80e4a826f02374c0740d963251b4e9ed6c960dcad15403511c33f3a2e199a728e8f5425a359963bd102 SHA512 82be459856f49f45c9b824589b78c0f58b039b09802e077420053e9449bc1ded272bb8ad57ea10522d8b3305ceb212a5dd08b01052538cd5b4f0447d0ba02152

diff --git a/www-client/links/links-2.20.2.ebuild b/www-client/links/links-2.20.2.ebuild
new file mode 100644
index 00000000000..d0e51b76c78
--- /dev/null
+++ b/www-client/links/links-2.20.2.ebuild
@@ -0,0 +1,170 @@
+# 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 ~sh ~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/metadata.xml b/www-client/links/metadata.xml
index 3cdd882b514..a6d8060d24d 100644
--- a/www-client/links/metadata.xml
+++ b/www-client/links/metadata.xml
@@ -5,7 +5,14 @@
     <email>monsieurp@g.o</email>
     <name>Patrice Clement</name>
   </maintainer>
+  <maintainer type="person">
+    <email>bkohler@g.o</email>
+    <name>Ben Kohler</name>
+  </maintainer>
 <use>
+  <flag name="brotli">Enable <pkg>app-arch/brotli</pkg> support</flag>
+  <flag name="freetype">Enable <pkg>media-libs/freetype</pkg> support</flag>
   <flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> support</flag>
+  <flag name="lzip">Enable <pkg>app-arch/lzip</pkg> support</flag>
 </use>
 </pkgmetadata>