gentoo resync : 29.10.2017

8 files changed, 272 insertions, 33 deletions

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index f51067c045f0..15cafc466117 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,6 +1,8 @@
-AUX elinks-0.10.4.conf-syscharset.diff 2580 SHA256 3269413843aabff245ee3dce522a475e5b3042adf4676b644a63d323bb77818c SHA512 3b17025054f9cf2ed9934ce5c19859eb50a216a295e6712659c4899c3539e3fc571e6f289809ad2d07be44330b96107a8dd65754c23f978bd54def28a24b88b3 WHIRLPOOL 230294ec39cec90ae84fd23644bcdadb97de8635eb794b4baf8e93d0b0fc2932f7b54ee25f6c4e49166aa4e296ab05f5588561fcab56867bb3caee0b9ab9db16
+AUX elinks-0.10.4.conf-syscharset.diff 2584 SHA256 375d1b5fe3cc693035f2db1ad18bd940448c19aba0b3f6f75e30deb023d40dbd SHA512 bed691b24adf7aa408af01e3a0a905946f9fe95cc5ded7e1448d9159ef7777bc2df1c3ef37c5498fc0f64bc59df80493fc42076bafa708c80ef5cba78e8bca9c WHIRLPOOL f536c9bf51de0697842a704a65329c75e88f8f3393b846eb0aad44ddde8cba8634a6107c1617b84aa74f52dfc869cdf0dba60a0dad5c1c8502f6c9f6ed0a38f5
 AUX elinks-0.11.2-lua-5.1.patch 538 SHA256 d931af4db13b53be32def17417d86ee916511209ce9a54f25d017ee2d24473d4 SHA512 48aca9662b3d9b43ba027d2328acdafe6363f3e2a69e6f2a6d468718c28f12de6247c629273a11aef0b053010a7b7250c03db39fab1cb4cd6d237bd1c69fccef WHIRLPOOL 4f84c457ed14a2d7414edbe374623e5295aa9ee8aa71403d386a46b499143a97d1dc78ff5d8951d602f8d60cefc648f79ed02038267cb58ae79ba062e68d1e34
 AUX elinks-0.12_pre5-compilation-fix.patch 464 SHA256 984c3e1127c18eb0925fbe1cca5bb2a7b214c6cd082db434e8fe37e082715e7e SHA512 7c1232f4f15579f8073cdea7397e4a34d5bec51268eb61cdff854f221615b027c385b81871e7b5fbefeda1ddf5de3008719724b9853798bc198866a25c8840fe WHIRLPOOL 1a3303d1ed36429bf47b4a1e55a87917d3fe20417f218999c1a02a90c199b4a1dc914a674c86fce8c62cb5cb3ab11019c2547de8c9cb44fe5660f2673b706062
+AUX elinks-0.12_pre5-libressl.patch 845 SHA256 2187e35039ec4f151e98de3c90aa30b186cc654f7181e644d7174af3feb2fa0a SHA512 7cf844e5f62abc20b9fffd29c82a786504db4e645a794b98238ea7157db1fe8bfc3e4c211c674ff182aa5d540350b2c8cae34a61891dc79afa1e2525448b747a WHIRLPOOL 45694f73f39a30b149e6d4d16ec916c27b7f5d2825fd4e9f6aa52d9542545f3c11731ce32b12929c0384d4c2929f7f731e5940511254b33d893e2e55a747d459
+AUX elinks-0.12_pre5-rand-egd.patch 738 SHA256 4e0b07b958685cad86a7099f021371f358dbe88dcffc8bc6f955cda30e9cf503 SHA512 7d23496380658f102d933a1722313d1b0396afb0b349260cb7cf735baec4edd08cb5ad363880d6bb95ef67e46770daa8b4aa57116a53ec36762db05a58ed09ff WHIRLPOOL 6203081b1acb9df84493a7ff0ce3fdc8e0e336a7798780526e4caefd611790ad425aaeabef660fc92b8500135e10ff8cc2d0bd58fc91dea544b22971f790aeca
 AUX elinks-0.12_pre5-ruby-1.9.patch 7131 SHA256 4274a6434c42b669fbee9e75a79bd02c33d50472bbb8e1c2ea441b3d2eae20de SHA512 41f8b34f9666740fbadffc4e47467670c7766f3b8612933a08cc6febe975f9453c21c393a43927c11ffe7ef6e0875ef09e125c80e84caa9f0917f864cb1d35e6 WHIRLPOOL 691d259ea49b1a859680b245a383fcf1da79626e848fb35489bdfa787c0fe0c99405610a10a03dbdde7847a838e8ac060c37136b8f71ce73751449afd7b293fa
 AUX elinks-0.12_pre5-sm185-jsval-fixes.patch 3921 SHA256 d59f9e97f5d495803e0ac35726bf42592a8f726c2367fbc08b8fe9de79de4a2f SHA512 62a96d53b529c409d81094899c75cd7943176628e2b7301a005c6ebf9f660e813fbf1f3df213c43148d425e933208f761090b23b6ae75da93a93b13a1e924a34 WHIRLPOOL 03ae46d5a9497ac81db5cca364aa6cda4bfb3dc5864482e11778dfef752ae4c76a374026fafa3e2507c9626c528b483bd68a3277647b4c200de95197507fefa5
 AUX elinks-0.12pre5-spidermonkey-callback.patch 513 SHA256 14b65ba92e8693105945d20de6e8f07ec946f17fbbf5248b4f8c431a92b88982 SHA512 81a2397b90531db291526fed738fd3661362c3d20c4bc330f909375cea3779f32f4286c8c43700bf7c19d6eb177e97acb3c32f15abba052651ee5b947f3bec43 WHIRLPOOL 224e95b0f09c61de04c1b6e9845a56ca94ee5c99fb90a7c9e57800c1cede50658091d7b1b3a7aec5a0bad9b7eff2e5ca4a1f7a107381bf8208b08e1624661f3d
@@ -9,8 +11,9 @@ DIST elinks-0.10.4.conf.bz2 5370 SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613
 DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 SHA256 64f7c4a657128983d054bd0d2027e11facd42fcc86bd8dfdf5b27ffbacbd54c8 SHA512 1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c WHIRLPOOL e6f7746407cd6654c19d4bc71dc4d0fd63070a78f7bc7c43f11f6e388268de963748597b0a2fd03cd22632651800b990ec0819d54799be9bfc4589332e11dbdd
 DIST elinks-0.12pre6.tar.bz2 2854500 SHA256 383646375b8a325bef5a132c8300caab90eb0b842c5f8eff68febc00e29acada SHA512 bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f WHIRLPOOL 2501e7ed557dfcc5ca4175bda3452d8c1dc42c2db2f18a0263373b6f28966619e3b3c75b0ed3d9cb4e04d177bd5d88ecdedda541531adfcd35b6ef4fe4920ed1
 EBUILD elinks-0.12_pre6-r1.ebuild 6169 SHA256 8aa6e19508521d4d980065e2e5bcd61eeba3acb5a0c558ca145dbd0b8ddb620c SHA512 55fdeff2c895755867af2b8955f2c998c0f4630a42bf6b42cd04fc06375319711cd9d16148e4c3522f3aee01fc815afc66f8d7985c861aec93edf662c76dd8b5 WHIRLPOOL ea399425b28c4e9a9e4ce58b4be3480e61815917111464728674a2071bb65c2451e84f880a3c23c69dee135fa6f77c43961cb53ac1ab441e42512b4a62605e88
-EBUILD elinks-0.12_pre6-r2.ebuild 6237 SHA256 a77c2f000850daa94ad1678418c3562dfa74d0c3ca771deb4c7f195198fb9b9e SHA512 577d54441d67bde1ef5c184def7966307d6edbcc7f1150bd7877ac52e92986007b78d7940d368a750459d27943e23a412076a3f48f3842f69dcf7fd3ab79d119 WHIRLPOOL 9d2bd6dddfe15f3ace534675a3d70dd340806f799ab19f1573bcea7915fbc39fd41562610589aebe657a2988e581cccb84fa7bd823c98a3473ba0e906fca89fe
-EBUILD elinks-9999.ebuild 4541 SHA256 1645bce21dfd50610d9d70e2adffaed98542f64161d66ab743e6fa2309a9f1aa SHA512 fc872f241992d8239971b64498d3a1e8b3be26de4b37c1ea3369fb5ff823c96d8e93e9d8d0f6e73bd781836fb1c53d6b6ea11d76d905ca8432d0406a6cee36ae WHIRLPOOL 70c9b08c0299576f20ea3fad5767cfe2713449d569c6f599eee99ae206ad8080290c733d3f529192c36360107bab875f349d7c21d9288038591605a8f30d5499
+EBUILD elinks-0.12_pre6-r2.ebuild 6343 SHA256 e807dc2d6d37388c9613b9dab45e5f2af1223dea72e764fdf1bf5b10dd7bd814 SHA512 f5d57136d9cc2d395bf9557e582a117d45836b81434c5ca35674217930be584587da53d5210e014ecf7b21f3e1ae07a63161f94f85631d85665ff4bd68d6b7ec WHIRLPOOL efae0e1bd4100614f3ff069a1079b0d6cd44c078db1c96939d677b4e72191e385757d603dc04b1d6f12895cc35d9257f3bd43c99f6d026c97b73ac6ad6a8431f
+EBUILD elinks-0.12_pre6-r3.ebuild 5416 SHA256 6eb59b803158f6e914ba86e14ff709ed54c07f2fd3b9a846e8a1d1c4d982709a SHA512 b59b43e845a2b38260b44b6ad9d4c152d7dee2df5f79ef95af2370d75611f7072b47492acd2f6d78d82c71ef8c38d32e7310fd5f830b923d991fcbf1186ebe53 WHIRLPOOL c7ce1bf83cba5bd8ca479907aa0438c062b4407ffabb48be73a2fd65208e20be3734cc22efa5ccd2c8dd576fc88643917dfaf217ff2db2655f567cd7a5d2c17e
+EBUILD elinks-9999.ebuild 4574 SHA256 8e8f25753aac8d4bc7d83719869e99f7af5b918c561cafe2a7f1b37011347b7d SHA512 83afd5e717271d062906b5da0c2a3f47af91c725d20f8f5cd183067c69b108bd036fbf5fdc851049f75902af5cbbba131f96bb05c1df2db7fa65d49756dfd713 WHIRLPOOL 2ec12d3bd7ab9de3218345ac6c2a74ff81c89dcbea0e9a96cda041bb8c7002efad3a4ef53ab9005b708b7a1fca329892d2baf98a11b7ce2b7ae76be16c266f4e
 MISC ChangeLog 4414 SHA256 b262ad1bf7c6a9a6f6c235e3c18dc9d1bf8e02464fe9d02261f027f39030daef SHA512 4e638a40d71c0255fbcaaece19e086b2ab686f3925c94e2bdcdd1db4fc0df5d095c288aecbf1f29eb3d20e9c57e64f325914304c57f3a64167d36533136a8f05 WHIRLPOOL 8081af9da11d5348596d8983c316d0419fbd91653f77c526d4ee975165b3e39f0eefc4af8a631694d8206937491915b808229e3edbdb9792b682b01c4db9e5be
 MISC ChangeLog-2015 31519 SHA256 71745c2c3c1045e62ad4e81c483e1631b1ade3613960e1ceac53e7138667661a SHA512 69e0aed4825d552cc2759f4d450ade766d0af7a9d28bb5dcf0b8f2bd84d42b8ccf3ef3c359ddbca50d6a2adde93d69a9cbbfb1354ddf25d5f76b8debd1bfd281 WHIRLPOOL 46b05f4a92f49f420abd0841116d3e302d5ce9078a8fd4c8df3fe2e56941ba6a21567bbb5130d8a54e677913c7dee25e4a45a27743ce7e3dddc2939e8b0dfe17
-MISC metadata.xml 635 SHA256 03fdbb613dbce47c3e8cd7be83528bdecff6968042931989755f8d55ff4110f3 SHA512 66de279c7b713e59e8579d0990213a152c2a040b02224b4a813e77417aac71fbae4e6ae1e7f0885d1fec5e08dae3d6cf38301e783a7aa25a48250af69b5bfc01 WHIRLPOOL c7e497d81566d35ae20bdebe8b8d8dad03c8b505a522cd59f98dfefaeab8f10639601fcc034362beeea3d0103824eb7b98e849e383696ebe93ceda62f41f2a92
+MISC metadata.xml 989 SHA256 cc80a0b131e9c1dcb136c3b9820bdc1d8d1219a9bbbf1b82818532adcbff4584 SHA512 66a3bb8694de90a61d37a4fe5029afc894b12eba7ce7832159f88ca3168ee99c324179b27edf2876f94b4465e81cc218f5d271fff92a495bed11dd6b8ffad990 WHIRLPOOL b97ead80f12aba36dac7afad2b9e3e7744501a68226cb5929dafceb6e97f3525380773cf13914adb6922d4d1088e6d4232f802f6735d05eb57d643a39052205e
diff --git a/www-client/elinks/elinks-0.12_pre6-r2.ebuild b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
index ed3f69831bd0..e9e8625888a0 100644
--- a/www-client/elinks/elinks-0.12_pre6-r2.ebuild
+++ b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
@@ -56,6 +56,8 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-9999-parallel-make.patch
 	epatch "${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
+	epatch "${FILESDIR}"/${PN}-0.12_pre5-libressl.patch
+	epatch "${FILESDIR}"/${PN}-0.12_pre5-rand-egd.patch
 
 	if use javascript ; then
 		if has_version ">=dev-lang/spidermonkey-1.8"; then
diff --git a/www-client/elinks/elinks-0.12_pre6-r3.ebuild b/www-client/elinks/elinks-0.12_pre6-r3.ebuild
new file mode 100644
index 000000000000..b57789f25fd0
--- /dev/null
+++ b/www-client/elinks/elinks-0.12_pre6-r3.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils autotools flag-o-matic
+
+MY_P="${P/_/}"
+DESCRIPTION="Advanced and well-established text-mode web browser"
+HOMEPAGE="http://elinks.or.cz/"
+SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
+	https://dev.gentoo.org/~axs/distfiles/${PN}-0.12_pre5-js185-patches.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6
+	  javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
+RESTRICT="test"
+
+DEPEND="
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	gc? ( dev-libs/boehm-gc )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	xml? ( >=dev-libs/expat-1.95.4 )
+	X? ( x11-libs/libX11 x11-libs/libXt )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	lua? ( >=dev-lang/lua-5:0= )
+	gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
+	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
+	idn? ( net-dns/libidn )
+	perl? ( dev-lang/perl:= )
+	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
+	samba? ( net-fs/samba )
+	tre? ( dev-libs/tre )
+	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-parallel-make.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-libressl.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-rand-egd.patch
+	"${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-ruby-1.9.patch
+	"${WORKDIR}"/patches/${PN}-0.12_pre5-js185-1-heartbeat.patch
+	"${WORKDIR}"/patches/${PN}-0.12_pre5-js185-2-up.patch
+	"${WORKDIR}"/patches/${PN}-0.12_pre5-js185-3-histback.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-sm185-jsval-fixes.patch
+	)
+
+src_prepare() {
+	default
+
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
+	mv ${PN}-0.10.4.conf ${PN}.conf || die
+	if ! use ftp ; then
+		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die
+	fi
+	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die
+	cd "${S}" || die
+
+	# fix lib order in configure check
+	# (these seds are necessary so that @preserved-libs copies are not used)
+	sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs185 mozjs js smjs; do:' \
+		configure.in || die
+	# Regenerate acinclude.m4 - based on autogen.sh.
+	cat > acinclude.m4 <<- _EOF || die
+		dnl Automatically generated from config/m4/ files.
+		dnl Do not modify!
+	_EOF
+	cat config/m4/*.m4 >> acinclude.m4 || die
+	sed -i -e 's/-Werror//' configure* || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if use debug ; then
+		myconf="--enable-debug"
+	else
+		myconf="--enable-fastmem"
+	fi
+
+	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
+	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
+	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
+	if use ssl ; then
+		myconf="${myconf} --with-openssl=${EPREFIX}/usr"
+	else
+		myconf="${myconf} --without-openssl --without-gnutls"
+	fi
+
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/elinks \
+		--enable-leds \
+		--enable-88-colors \
+		--enable-256-colors \
+		--enable-true-color \
+		--enable-html-highlight \
+		$(use_with gpm) \
+		$(use_with zlib) \
+		$(use_with bzip2 bzlib) \
+		$(use_with gc) \
+		$(use_with X x) \
+		$(use_with lua) \
+		$(use_with guile) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with idn) \
+		$(use_with javascript spidermonkey) \
+		$(use_with tre) \
+		$(use_enable bittorrent) \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		$(use_enable ftp) \
+		$(use_enable gopher) \
+		$(use_enable nntp) \
+		$(use_enable finger) \
+		$(use_enable samba smb) \
+		$(use_enable mouse) \
+		$(use_enable xml xbel) \
+		${myconf}
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	insinto /etc/elinks
+	doins "${WORKDIR}"/elinks.conf
+	newins contrib/keybind-full.conf keybind-full.sample
+	newins contrib/keybind.conf keybind.conf.sample
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
+	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
+	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
+	docinto contrib/conv ; dodoc contrib/conv/*.*
+	docinto contrib/guile ; dodoc contrib/guile/*.scm
+
+	# elinks uses an internal copy of gettext which ships files that may
+	# colliding with the system's gettext (https://bugs.gentoo.org/635090)
+	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
+}
+
+pkg_postinst() {
+	einfo "This ebuild provides a default config for ELinks."
+	einfo "Please check /etc/elinks/elinks.conf"
+	einfo
+	einfo "You may want to convert your html.cfg and links.cfg of"
+	einfo "Links or older ELinks versions to the new ELinks elinks.conf"
+	einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
+	einfo
+	einfo "Please have a look at /etc/elinks/keybind-full.sample and"
+	einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
+	einfo
+	einfo "You will have to set your TERM variable to 'xterm-256color'"
+	einfo "to be able to use 256 colors in elinks."
+}
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 86a85d7419f6..f608a19718e3 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
-inherit autotools eutils git-r3 flag-o-matic python-any-r1
+inherit autotools git-r3 python-any-r1
 
 EGIT_REPO_URI="git://repo.or.cz/elinks.git"
 
@@ -16,14 +16,14 @@ SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6
-	  javascript libressl lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib"
+IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6
+	  javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
 RESTRICT="test"
 
 DEPEND="
 	${PYTHON_DEPS}
+	brotli? ( app-arch/brotli )
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	gc? ( dev-libs/boehm-gc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
@@ -38,39 +38,43 @@ DEPEND="
 	perl? ( dev-lang/perl:= )
 	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
 	samba? ( net-fs/samba )
+	tre? ( dev-libs/tre )
 	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-parallel-make.patch
+	)
+
 src_unpack() {
 	default
 	git-r3_src_unpack
 }
 
 src_prepare() {
-	mv "${WORKDIR}/${PN}-0.10.4.conf" "${WORKDIR}/${PN}.conf"
+	default
+
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
+	mv ${PN}-0.10.4.conf ${PN}.conf || die
 	if ! use ftp ; then
-		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' "${WORKDIR}"/${PN}.conf
+		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die
 	fi
-	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' "${WORKDIR}"/${PN}.conf
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-
-	epatch_user
+	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die
+	cd "${S}" || die
 
 	# Regenerate acinclude.m4 - based on autogen.sh.
-	cat > acinclude.m4 <<- _EOF
+	cat > acinclude.m4 <<- _EOF || die
 		dnl Automatically generated from config/m4/ files.
 		dnl Do not modify!
 	_EOF
-	cat config/m4/*.m4 >> acinclude.m4
-	sed -i -e 's/-Werror//' configure*
+	cat config/m4/*.m4 >> acinclude.m4 || die
+	sed -i -e 's/-Werror//' configure* || die
 
 	eautoreconf
 }
 
 src_configure() {
-	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
-	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
-	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
 	local myconf=""
 
 	if use debug ; then
@@ -79,6 +83,9 @@ src_configure() {
 		myconf="--enable-fastmem"
 	fi
 
+	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
+	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
+	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
 	if use ssl ; then
 		myconf="${myconf} --with-openssl=${EPREFIX}/usr"
 	else
@@ -94,8 +101,8 @@ src_configure() {
 		--enable-html-highlight \
 		$(use_with gpm) \
 		$(use_with zlib) \
+		$(use_with brotli) \
 		$(use_with bzip2 bzlib) \
-		$(use_with gc) \
 		$(use_with X x) \
 		$(use_with lua) \
 		$(use_with guile) \
@@ -103,6 +110,7 @@ src_configure() {
 		$(use_with ruby) \
 		$(use_with idn) \
 		$(use_with javascript spidermonkey) \
+		$(use_with tre) \
 		$(use_enable bittorrent) \
 		$(use_enable nls) \
 		$(use_enable ipv6) \
@@ -123,20 +131,20 @@ src_compile() {
 src_install() {
 	emake V=1 DESTDIR="${D}" install
 
-	insopts -m 644 ; insinto /etc/elinks
+	insinto /etc/elinks
 	doins "${WORKDIR}"/elinks.conf
 	newins contrib/keybind-full.conf keybind-full.sample
 	newins contrib/keybind.conf keybind.conf.sample
 
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
 	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-	insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
-	insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
-	insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
+	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
+	docinto contrib/conv ; dodoc contrib/conv/*.*
+	docinto contrib/guile ; dodoc contrib/guile/*.scm
 
-	# Remove some conflicting files on OSX.  The files provided by OSX 10.4
-	# are more or less the same.  -- Fabian Groffen (2005-06-30)
-	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias || die
+	# elinks uses an internal copy of gettext which ships files that may
+	# colliding with the system's gettext (https://bugs.gentoo.org/635090)
+	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
 }
 
 pkg_postinst() {
@@ -152,5 +160,4 @@ pkg_postinst() {
 	einfo
 	einfo "You will have to set your TERM variable to 'xterm-256color'"
 	einfo "to be able to use 256 colors in elinks."
-	echo
 }
diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
index dc64712b29a8..83accf4c2d95 100644
--- a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
+++ b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
@@ -1,5 +1,5 @@
---- elinks-0.10.4.conf	2005-04-08 15:29:49.000000000 -0700
-+++ elinks-0.10.4-syscharset.conf	2006-11-04 00:26:26.000000000 -0800
+--- a/elinks-0.10.4.conf	2005-04-08 15:29:49.000000000 -0700
++++ b/elinks-0.10.4-syscharset.conf	2006-11-04 00:26:26.000000000 -0800
 @@ -12,8 +12,6 @@
    # obsolete config.saving_style. You shouldn't touch it.
    set config.saving_style_w = 1
diff --git a/www-client/elinks/files/elinks-0.12_pre5-libressl.patch b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
new file mode 100644
index 000000000000..d41ab689e9f1
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
@@ -0,0 +1,29 @@
+Adapted from upstream
+commit 54ebe365b752f8969a67279d0d29552ab638e025
+Author: Witold Filipczyk <witekfl@poczta.onet.pl>
+Date:   Mon Mar 6 17:39:36 2017 +0100
+
+    Compilation fix for OpenSSL-1.1
+
+--- a/src/network/ssl/socket.c
++++ b/src/network/ssl/socket.c
+@@ -67,7 +67,9 @@
+ ssl_set_no_tls(struct socket *socket)
+ {
+ #ifdef CONFIG_OPENSSL
+-	((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1;
++#ifdef SSL_OP_NO_TLSv1
++	SSL_set_options((ssl_t *)socket->ssl, SSL_OP_NO_TLSv1);
++#endif
+ #elif defined(CONFIG_GNUTLS)
+ 	{
+ 		/* GnuTLS does not support SSLv2 because it is "insecure".
+@@ -145,7 +147,7 @@
+ 		}
+ 
+ 		if (client_cert) {
+-			SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx;
++			SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl);
+ 
+ 			SSL_CTX_use_certificate_chain_file(ctx, client_cert);
+ 			SSL_CTX_use_PrivateKey_file(ctx, client_cert,
diff --git a/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
new file mode 100644
index 000000000000..6c5679a95bbd
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
@@ -0,0 +1,20 @@
+--- a/src/network/ssl/ssl.c
++++ b/src/network/ssl/ssl.c
+@@ -84,11 +84,16 @@ init_openssl(struct module *module)
+ 	 * cannot initialize the PRNG and so every attempt to use SSL fails.
+ 	 * It's actually an OpenSSL FAQ, and according to them, it's up to the
+ 	 * application coders to seed the RNG. -- William Yodlowsky */
+-	if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
++	RAND_file_name(f_randfile, sizeof(f_randfile));
++#ifdef HAVE_RAND_EGD
++	if (RAND_egd(f_randfile) < 0) {
+ 		/* Not an EGD, so read and write to it */
++#endif
+ 		if (RAND_load_file(f_randfile, -1))
+ 			RAND_write_file(f_randfile);
++#ifdef HAVE_RAND_EGD
+ 	}
++#endif
+ 
+ 	SSLeay_add_ssl_algorithms();
+ 	context = SSL_CTX_new(SSLv23_client_method());
diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml
index 983c04de930f..8dfd5728bec7 100644
--- a/www-client/elinks/metadata.xml
+++ b/www-client/elinks/metadata.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>felix.janda@posteo.de</email>
+		<name>Felix Janda</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="bittorrent">Enable support for the BitTorrent protocol</flag>
+		<flag name="brotli">Enable support for brotli compression</flag>
 		<flag name="finger">Enable support for the finger protocol</flag>
 		<flag name="gc">Enable garbage collection support via <pkg>dev-libs/boehm-gc</pkg></flag>
 		<flag name="gopher">Enable support for the gopher protocol</flag>
 		<flag name="mouse">Make elinks to grab all mouse events</flag>
+		<flag name="tre">Enable support for regex searches via <pkg>dev-libs/tre</pkg></flag>
 		<flag name="xml">Enable support for bookmarks via <pkg>dev-libs/expat</pkg></flag>
 	</use>
 </pkgmetadata>