Remove useless nonfatal function call when creating documentation with dodoc. Fix bug 551196.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 152 insertions, 13 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index b39bd04357df..6678efa3aa80 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/links
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.205 2015/05/20 07:58:57 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.206 2015/06/04 14:39:54 monsieurp Exp $
+
+*links-2.9-r1 (04 Jun 2015)
+
+  04 Jun 2015; Patrice Clement <monsieurp@gentoo.org> +links-2.9-r1.ebuild,
+  links-2.8-r1.ebuild:
+  Remove useless nonfatal function call when creating documentation with dodoc.
+  Fix bug 551196.
 
   20 May 2015; Patrice Clement <monsieurp@gentoo.org> metadata.xml:
   Add myself to the maintainers list.
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 509b26087b02..26f07f1ea239 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -5,18 +5,19 @@ DIST links-2.8.tar.bz2 4102643 SHA256 7950da386fa2014d75edc23abfaeed1b1f171ebc73
 DIST links-2.9.tar.bz2 4111393 SHA256 4360ead54d5f41da16b2f4c0033317ca775f40c1e658a29e9e7f8ce4bc23878f SHA512 386f53e8a8eac78b5f1a85277d449f2cc23e96dbc505c776fa5123c3c4ee34916c9da867766849fb71ff7701df161bd1906a34468bd9c31183abdce1d03819a7 WHIRLPOOL b3f4e88df0df05c20c8915ebb30b81aa0aef519ef09fff0f6528c787174adcd003b68b2374851b7b37d4329ea6b4766f6a2a6145703a1d8ce338dbaf1a57dab6
 DIST links2_2.8-1.debian.tar.gz 12121 SHA256 878529c4f93c934c1821edc3576ca6219bc4018f4e29866d6ffa469681a0bd80 SHA512 134fb292c88ec4d36529886d0e5d12083b773f38b89cb90b471b5f6b11d7f8d990de0a57ade5eb5f887cf1c4398687a6e81aed4a660959e81219c675c1de6af2 WHIRLPOOL e9c362de5874ca8de96a2ef184c81e40fa365e9d4e20c4a902845749946a438060ef2784e87972d40c459d4979e0e0ffc8158a5dcab1e02fc3980413c79edfc4
 DIST links2_2.9-2.debian.tar.xz 12708 SHA256 ec074c302da1cd7410a8af3414e2b600653e89ad874937deb37f00dd98428a55 SHA512 9663145a1ec5de7b17b6805d2051a6259c2a80502b7c9742d265863a961dba76caff170af9088bbc9ff4b0353a8d2fba3e87f67d7c99df2e91ff7d919d3c9964 WHIRLPOOL 505a8c6e9af35161ef4430f5b7f73027d615e9d87b575ea382ed2ab235388bc6df29771be1b0d736d1d91e99e2e17a461923e6415cf63fe9688ab376afc9d281
-EBUILD links-2.8-r1.ebuild 3305 SHA256 0e15e4c34cf63d13710b459f8718d5073d38abdbed7ad2d27b823d54f5b4fc63 SHA512 8814b35559576fa7a6065a5d3f421387a807de649028411bf82098f67b775f8c1075bddb3dab8078d912062df1b9030669faee01b31f6cad20dc4bf0f9e2fdac WHIRLPOOL 08b4c69b5149579b7a6a56d90c310f09c5ff4d059d144ada30c9065949361bda5da50910d4f58010dd2104f8e7bebf330dd81ea85373647c321c26a3324dbc01
+EBUILD links-2.8-r1.ebuild 3302 SHA256 15bd9c02f3d4715547e4c5ccfcdf45310a8648473261ad1f69b8d24c46b4e511 SHA512 09fb9e2256f6131c20caff01f79a9a33b2224bd981ccc34e8960e06f34cd7c5d1a2e914ac4d90ae29e225ed60892b9ed31dd8183a8e5ff4f602ab24b8c6b8630 WHIRLPOOL b2fc77fc8477457831f6c1e2e31d658d101692a2bc9c5a0208c9fba7a4d19274a1960232344c0c48b986cea52c1d964d1b4b8f8b52a229b346e7034d530df16f
+EBUILD links-2.9-r1.ebuild 3310 SHA256 4021ed8248c3f4787817b8e1f5e28f1c06fcf18b03185661268b15855b80923b SHA512 62e7e43a3ca92b02e1c83e88dc824fb7b6d626834c379b274a9377079e1606824967035cd9b629282bda0f5b49828b99ff0176a766fcdbfa02e828466ac6ab98 WHIRLPOOL 3fdd4cc3687513c554f0c144628f8232a771d854c152210ca59ae65373d3c5b7aaf63bc2edd8e8eaa13573f4cb9b021c7af2ad198504b3f233f884ed90dffaec
 EBUILD links-2.9.ebuild 3316 SHA256 a76f34ed213ff99389dcbe98fc94183cf7498a189f98d73dc822c945e985812e SHA512 75eece34ac2260da1af3c37cbd8cd5464d5147387b833ec1d5d5a6333359792d7b9334331e6a81af923265bd44fd71412ebe8fb8a75375f6f2ad258e2f8ed279 WHIRLPOOL 4a01cfb6a152abea2b0a3c759d1beb91e57134e1a008128c3a6df908fa1358e514327da8713a8020389664077c82c7b43d76d7e0ae67fe773f0f5e0d69b32489
-MISC ChangeLog 37296 SHA256 29455efc03c9590e2ad469bd75f9933bb73b0c9ad127cfd814740d2afcad8a93 SHA512 263431298e182aceafb9b9707fcd02a234b56a6cf0aeec6ec9a10f85aedf29eb566093e62cc6c31af9e6c26c26b4fa5e890d06874e60fa1591c254343fe068bc WHIRLPOOL 433dec32ef50953e5066c30a2ddd7fa6a8a70cd8ae5f8c62e6b83663fec40463311990bea916a480a386cb9a15238dc7821dd01afc0298bd91224825828b9898
+MISC ChangeLog 37523 SHA256 dee44e5d83051982a012cc52397a61b77e71afae79f0a1488714dcdfd97b019c SHA512 c76208e9fd7a1be2e7f3ea23bde7f2bcb9334787b9f9a0bfb9d0228117e93e47e2c14c6aa61b995fa8d1c23b578844ee1d24ce7374b6c365549e49c95989e8e0 WHIRLPOOL 8e7d3067b2cb12f43811cdd02fb3b90404db9ade78eda4409f382d390526a2afe322ea68259f50abea64de4dc360d632ef346772e248bd0f0ea6e68895a4ee3b
 MISC metadata.xml 446 SHA256 645f1eef0ed6983009da774e8f3c751998735c2a1832e5e22c62ac6ff2f672a7 SHA512 c6d8cf32c4bb30282bead521b837e93dc9a38cbd68c4c2010824ae60998ec516a305c7fc3c4ed24763c0a811d33564efcc235ceffd25ffa34e32734d3366d3d9 WHIRLPOOL c7549b65545cda01a6cbf6de3df4ad7426e01f9c3b0d4e04f0c5016e8b1fa8bd6b78410009095dfe614f4a301f487e454b8e252ac2e7fa0aefd6e89ee1c99d6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVXD5eAAoJEJGRpfGTSRu4iJwH/AoUlR6Xh0+chU2D2w1C2aq5
-sVvD/t9elEZlmM+M9zN1DMhQn15P5tF/FOK7i64631+S+oQDl4ITxGjM5+qZcIvd
-9/fRwmWQCcGhQs8H5dCa1UKjqg004MJTg2wWC/Mtfj5TZViJQfx3lTBwbXIIROqI
-0/OfwfvWeDBOIRaOigYv5llNEbSrTf18N2u+Xth0Qs9354zNvuAh+uwoWwBPe/AU
-VBP9DioSmH+TiI+3jtqzHU6buAmle8jH9yNT0/uIztH1qSmjeq+XYN6rC077PqYs
-Fgb543Vq49Co9aW7B2BDyMACz2ZbjTS+RbUjzKmS4SeMGQv54H9lZvXtKumIQzw=
-=ADAi
+iQEcBAEBCAAGBQJVcGK/AAoJEJGRpfGTSRu4KQwH/iX2LBk0acHrxr0hqPaUXJen
+OmTaCsBzOODtRH/PpkkOgvfyGBXRNBq3yOxpB/NWxaQpMv2n7gVRoIro8PxRWUEq
+S8F95KVYcxtOXrXjy9eqAp7bOMWsXD6u7bfyfu6cupX54HGAtnxqE09gTSJWC8Ft
+UEzqQoXoBaUhLWckwC8+ssP6CXwoxbjKZqm0qiYbwi20GkzriJEhyQckz1WqWvcG
+o+68UBU6AZhbG0NKdsn0KdLl8MsmWpYhgxbi73ZAhQpjEBnla0l1vYm1YYzrPVJc
+dbxEfYRUdIpr8h2o41RyzOKXlqxFIZVCrqGMJoK8mD0mPK3BrfbfWt+vr7kMtL8=
+=JRK4
 -----END PGP SIGNATURE-----
diff --git a/www-client/links/links-2.8-r1.ebuild b/www-client/links/links-2.8-r1.ebuild
index 2718b7240f4b..8ba41bb2ab95 100644
--- a/www-client/links/links-2.8-r1.ebuild
+++ b/www-client/links/links-2.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.8-r1.ebuild,v 1.10 2014/01/12 13:16:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.8-r1.ebuild,v 1.11 2015/06/04 14:39:54 monsieurp Exp $
 
 EAPI=5
 inherit autotools eutils fdo-mime
@@ -118,7 +118,7 @@ src_install() {
 			"${d}"/*.desktop
 	fi
 
-	nonfatal dohtml doc/links_cal/*
+	dohtml doc/links_cal/*
 	use suid && fperms 4755 /usr/bin/links
 }
 
diff --git a/www-client/links/links-2.9-r1.ebuild b/www-client/links/links-2.9-r1.ebuild
new file mode 100644
index 000000000000..e608205520fe
--- /dev/null
+++ b/www-client/links/links-2.9-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.9-r1.ebuild,v 1.1 2015/06/04 14:39:54 monsieurp Exp $
+
+EAPI=5
+inherit autotools eutils fdo-mime
+
+DEBIAN_REVISION=2.9-2
+
+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
+	mirror://debian/pool/main/${PN:0:1}/${PN}2/${PN}2_${DEBIAN_REVISION}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 directfb fbcon gpm ipv6 jpeg livecd lzma ssl suid svga tiff unicode X zlib"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7
+	bzip2? ( app-arch/bzip2 )
+	directfb? (
+		${GRAPHICS_DEPEND}
+		dev-libs/DirectFB
+		)
+	fbcon? ( ${GRAPHICS_DEPEND} )
+	gpm? ( sys-libs/gpm )
+	jpeg? ( virtual/jpeg:0 )
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+		)
+	lzma? ( app-arch/xz-utils )
+	ssl? ( dev-libs/openssl:0 )
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+		)
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+		)
+	zlib? ( sys-libs/zlib )"
+
+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() {
+	epatch "${WORKDIR}"/debian/patches/verify-ssl-certs-510417.diff
+
+	if use unicode; then
+		pushd intl >/dev/null
+		./gen-intl || die
+		./synclang || die
+		popd >/dev/null
+	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.
+	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 directfb || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		$(use_with ipv6) \
+		$(use_with ssl) \
+		$(use_with zlib) \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with svga svgalib) \
+		$(use_with X x) \
+		$(use_with fbcon fb) \
+		$(use_with directfb) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		${myconf}
+}
+
+src_install() {
+	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
+		use ssl && sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop
+	fi
+
+	dohtml doc/links_cal/*
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_postinst() {
+	use X && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && fdo-mime_desktop_database_update
+}