gentoo resync : 22.05.2018

3 files changed, 21 insertions, 18 deletions

diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 317c1a84fd84..923c89d6021d 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,5 +1,7 @@
 DIST links-2.14.tar.bz2 6535707 BLAKE2B e0a2f804e05fde94be50ee2dce1453c0c616aac29bd91a73f78b1976119aa5cfa8aa4b3df5e7feeb193bba74fbe3b32be50f4947babb4115a3e79835c2c241fb SHA512 d03b091957e0a2e06605fcf7c9bc56d48ebbcdc695f4ce894901540008455a9bc6544abdecd787faa041e2dbdff28b0d6ddcc9d26528d39d7d72750655c73575
+DIST links-2.16.tar.bz2 6697222 BLAKE2B dba0f00acf14e7994d3eeea7f77df897941690d959c2aa90924bb1256f310a6ddc969e2dc7ca8ca775f2ec06acebbabb30b35088a9cc6100b01f7fa6dfaeaaa8 SHA512 3ce169e214eae0f997c1f8647d354dc0803c9118a97dcd2594d62af23336890272f4b027d3ab0a0e151672d1506e50da0f0e561999c5841f0f183f32a279b14a
 DIST links2_2.10-2.debian.tar.xz 13964 BLAKE2B 2de4e49281a53d37d3d9bc53b5e49c3bac534f3ba5d7a57748f3ef998e6ff7f5309b5d6c7a00f72d623525fc1413fc15d1585ffa84c186d684467539cb807cef SHA512 01101edef00ede0b95857ea28d305e98198306c428b79bb9c05da16285d8b4052b7f800f7def67a945d498db440745d81b7e3b6a03c9b077d5bcf5da1cb2691e
-EBUILD links-2.14-r1.ebuild 3264 BLAKE2B f47ac285982aadbdd609a44e614e3cd0f7ccc6373e98ce80c38e91118324b33390f37de4efdaedff7d30d9c8340f8502b685f7f076ca2fe9d3202bc44e111eed SHA512 10ab0e03e2acab05dfadbabb95e5f58493cc919166840e3f00f7bf141514dd06940f8e92e5f2e2020bac608df93fd0d1d80db7f1c2c08616e0670ec551abf85f
-EBUILD links-2.14.ebuild 3332 BLAKE2B e1aa4ff36c8765869b25a374ee8a854a8f34fa5235a29c2b1a6f18f212df87b82cc5906b71d378c60cd9f18ad1bfd584b99908bbbdfb238f246c9b8ce03218de SHA512 b2f55df94ffda2db4bcab87115ae8caa92da6e993cc05e903b5675eef2ec6dfba711b3fd899f945a57800226c4fd479ed548c296a4d10d3640abc740970e02ba
+DIST links2_2.14-5.debian.tar.xz 15332 BLAKE2B 20c1d0f5a9eeac2f56bfc8d2e00f343ada5ac28e741fdb9635810f7e39563f0f052f7be0492923c3caf6f000246639bf3ae19ebd5dfb3d8fdfe4e4655dd0bac8 SHA512 d8038515c29998be9510723cdaa2b961d65141fd0b0f863e2fac80f41009a100f0bd824acd97735d089c932c1b5a979f0ed523d773721485b4418ec44df38872
+EBUILD links-2.14-r1.ebuild 3263 BLAKE2B 56181a50978854ccc5971cea6d5bf14679190670b9dd38b5ebfc3740bdc7255fd356c7cc39206156e6aa6a547815da2de8cc6bc75aff4971f3291707bd71c396 SHA512 d8275e5f3acd8020dc8c633dc0821b76c4ca5323f64c12c905ed690de7683d1e1f9b8457290776922baca3a7f6f0ba033204ad54d1189d4756592122e56864d0
+EBUILD links-2.16.ebuild 3274 BLAKE2B 9f581eb2186c4ed5a0807b7620af67cde5362548cd2c887abd3d99fbf77a932a36fe3a48844185943f807d5892ce70237e3e8751ef4dadaa89c31fb5ac1c8772 SHA512 4aee5abcd8d78fecdbe64842d9010858640c2feefe644d7eeb7a9037aedb6f92dca6066d2606b0c140f505d2343971758f70d4052d27dc350010dd80d8aaa1b4
 MISC metadata.xml 345 BLAKE2B 5d91a968b8b9185cc9c61d02a1980369e5cf8c87bef6a5de4e05d3b375473548d3cbec311920d52cd7aad4517fbc2ddb2d900d520e5b1d2b3445e1424ac16662 SHA512 40528fd846439acf44ddf1e49a65d7195aecb6d78e9d20d3d734fbb48b4cef842975cbe8383a8feba6e6894ebe0fa6b7cbc27c1ac663cc563aa1e8884e09c7d9
diff --git a/www-client/links/links-2.14-r1.ebuild b/www-client/links/links-2.14-r1.ebuild
index cee4173a3de7..3dc37e4b23c4 100644
--- a/www-client/links/links-2.14-r1.ebuild
+++ b/www-client/links/links-2.14-r1.ebuild
@@ -14,7 +14,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 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/links/links-2.14.ebuild b/www-client/links/links-2.16.ebuild
index 441b2bd680c4..fc5b0de6a65b 100644
--- a/www-client/links/links-2.14.ebuild
+++ b/www-client/links/links-2.16.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils fdo-mime
+inherit autotools desktop xdg
 
-DEBIAN_REVISION=2.10-2
+DEBIAN_REVISION=2.14-5
 
 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
+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 ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 libevent libressl livecd lzma ssl suid svga tiff unicode X zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
 
@@ -23,10 +24,6 @@ RDEPEND="
 	bzip2? (
 		app-arch/bzip2
 	)
-	directfb? (
-		${GRAPHICS_DEPEND}
-		dev-libs/DirectFB
-	)
 	fbcon? (
 		${GRAPHICS_DEPEND}
 	)
@@ -77,7 +74,7 @@ REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
 DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
 
 src_prepare() {
-	default
+	xdg_src_prepare
 
 	if use unicode; then
 		pushd intl > /dev/null || die
@@ -108,11 +105,12 @@ src_configure() {
 		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
 	fi
 
-	if use X || use fbcon || use directfb || use svga || use livecd; then
+	if use X || use fbcon || use svga || use livecd; then
 		myconf+=' --enable-graphics'
 	fi
 
 	econf \
+		--without-directfb \
 		$(use_with ipv6) \
 		$(use_with ssl) \
 		$(use_with zlib) \
@@ -121,7 +119,6 @@ src_configure() {
 		$(use_with svga svgalib) \
 		$(use_with X x) \
 		$(use_with fbcon fb) \
-		$(use_with directfb) \
 		$(use_with libevent) \
 		$(use_with jpeg libjpeg) \
 		$(use_with tiff libtiff) \
@@ -146,10 +143,14 @@ src_install() {
 	use suid && fperms 4755 /usr/bin/links
 }
 
+pkg_preinst() {
+	use X && xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	use X && fdo-mime_desktop_database_update
+	use X && xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	use X && fdo-mime_desktop_database_update
+	use X && xdg_pkg_postrm
 }