gentoo resync : 15.12.2019

4 files changed, 96 insertions, 171 deletions

diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest
index 7af75e4b73db..1388ff2c1267 100644
--- a/www-client/w3mmee/Manifest
+++ b/www-client/w3mmee/Manifest
@@ -2,6 +2,7 @@ AUX w3mmee-boehm-gc.patch 294 BLAKE2B ea27a7004cb46135cea7cf33925f9e19679346a02e
 AUX w3mmee-gcc-4.4.patch 218 BLAKE2B fb2d2db581348efbe51479a45d894ef8cac058438baa5817f5678b41b02dd8a6394394ee724d2c9bb12f1a635f3893646ff90f3e04edbea9a1d6be243527c87d SHA512 8da08aa704a2ae05a2ceaf4d0484aeb256261cacbe2fb89c59327a89951e6f23fc32bddc5988a24cfe048ce8f420f465e827e6ffea8ac8c5ef9eba2e1a2bf457
 AUX w3mmee-gcc-4.5.patch 358 BLAKE2B 9d9d4ce582f852b8fb9e81d2ecc756ffb061f988dea39fe094338da619806fbc1ab2fa72bd55b3f9dd2ed190bd2eb0fad0d2c7cab8423d17862fc4bd879d1820 SHA512 b3fe68ed1ab4819edec04306b4399c8f814732dd06f313d4081e38660c4e2b66c49e2fc33bf706f755492e30e15c2eafbb583aa83bfda210db654388970dcb8d
 AUX w3mmee-glibc-2.14.patch 776 BLAKE2B 66dd21827ebe0371da39900a9dbede435b27f0a971b25ea5adf71475502584a74c6850bd95394471b12880dfeab1e61b67ae7914a79892cec117f10efb165b3b SHA512 f566b25cd38b4e950a51030a149e137b50df7494eef4e72522bd00552fd9f02f7f1b57402ffe52b1a00d1c6eb25a3ffe64609e3439a8fe9bd3fa44fa5535460b
+AUX w3mmee-openssl-1.1.patch 2691 BLAKE2B 528d3bdbb22b602893cdfda6ada32aaa92a608b45365539afcbfd44263a9e1f74097fa624457957ac717fcc5ea899af09aecb3783237401df8e6013c57b9a514 SHA512 c136562f248fd39e737c6639099ee8b901880c2fba70e2e6fb3e3fdc76c85af9850db76cb8cda48bea9028b4a375493cf55f7ac8c0331742b133328954c8b761
 AUX w3mmee-rc_name.patch 322 BLAKE2B cc0ba425bf0c690ae769b777b2ae456c5723f101046a608226d2b26943f7738d4775e2affa85bf29ee39c0c18f3c5dc8d4ce8d2c4c6670504f0c1091fd079c86 SHA512 13400e6fcf60d807a17962014b71680c9d54f8749f096726f9b59974464889dd0bca254de298f28aa0fbf3d03bb7974aa429be4c2c6f8168af931802ff78b469
 AUX w3mmee-time.patch 608 BLAKE2B 1c380c5af1cfba502e5749810456944aa2eb52a3e73ee11b7972d937b7f5ae29b47d75081e2175ac737201f82f725b0cd4bcd0102e3f53d926a9d5ed485137f0 SHA512 2e70256bf7e328438f6b4e7dae8eb8775937efd70686a5a34dc5f4c25361b26e2356307105dfe1af002abba8bc7fc607a1858e8f0f500547c62ca873cc715b67
 AUX w3mmee-tinfo.patch 357 BLAKE2B 33ef18109515e789debcfe3a0addc67be0a69853bfda0e732ecde65c4271990dd93582c9f6a1e124679bafd75176c1da318a0c4f8d8e6310a792aea66777fa04 SHA512 ec9bb5936d55d2c2edab7c1ae025f72ddf7734a2b8c2dc152c1cb9eeba42db42c2072232924aed92f40cfd7218eafd9d57bd4bf5b5f8380569b0703a6bc1eb25
@@ -9,6 +10,5 @@ AUX w3mmee-w3mman.patch 631 BLAKE2B b155487da7120b5e106c7b747a7cfc0d3157bdd651da
 DIST w3mmee-p24-22.tar.gz 690094 BLAKE2B 9b779122a10f606fab8cfe9e3ffde7473f60ee65591de3a1eca241e563ced7c70260670da7c56c9eaf39010180733933eba039d743e723b0cc8c230ef8a31d81 SHA512 85d4d373a5a544f8c4fbc37e8344daaa5eae3ae007a0280c693aa8946c8cbf63f3fc92fb69c2597286921254e3234f29ee1b3f21e1c9d498b39a597a51e98761
 DIST w3mmee-p24-23.tar.gz 697342 BLAKE2B cdfd5752a29ee486ccb4cb174ac68aa2b93c818a088e28a8938ef308030b4baac69645e5adcf86361297f79b2473de483917f523bdd0cda0f6d0d93cc0755534 SHA512 fa74b9124e0790461ea7936411f89265c8a367326bf1bba7a5ea5f4abf748197e0926847f9860ec8d35e97f0e53bcdc69821fdd9d741fc8b18b5e11211aa3271
 EBUILD w3mmee-0.3.2_p24-r10.ebuild 3831 BLAKE2B 7fc6f1094f012938a8d69f95bedcb03636247fca6b22526dc530e272b21e6845c75e3f4eed9e72ff6353d8a982bc70d5ab41daeb70b9e128a9e59a86a0f4b884 SHA512 7a622fa47ccab3f458424da26374ec12493494b12ed61e2e9fde3f128e97e693f3b5a2446b15fdae9f7f7ff62a6e3e15b6ae71744ecc619a5f416c68123c01b5
-EBUILD w3mmee-0.3.2_p24-r11.ebuild 3834 BLAKE2B cd439d7e32a103a4ee7dd119cc909f8d00e219641b71f7464050f389e07f19739113c5d16bf7d6d6137234eb107496d22d3e237941ea4eed86ca1fc7fbeed49b SHA512 ca639a7d84a2764f6dd3a33b5ce5b753a68f0f8da068b6640b368c7cd3a4911c8f6b0832077dc050bcadeece30cc2a606b7ae5e1b2622a2966dc3200cc820e31
-EBUILD w3mmee-0.3.2_p24-r12.ebuild 3642 BLAKE2B f8f0aaa05fa3989ead7b0b47f872cdb2375b5b8e323cc7c1526ec8c6ebbecf2b1fac74da5f6c97f2318081ac0278da277fc10335fa14f69165cc6ac455e66738 SHA512 927eefb8857454ffe7bdcd2309d109ad80d431f5978853ae90cb824fc873856c9b061c257aca51efd840b4eae7bb821885c87b8848b08fb500d96c7e84b1e948
+EBUILD w3mmee-0.3.2_p24-r12.ebuild 3654 BLAKE2B b60f17bd85473e97a8f8313a699c887d544b705e03d9ad15b96486094ea262c5b2b5fb7326c5aaa241e24ca785c59543c76b4e02749f7aa5f7bf89388979fbeb SHA512 ad14b44ffcc594aaf04b35f254511303cec2a6b055b4cbc85ded7308080de21b2cfb72ee6d81d25eceb13fd593b9f225b6901630cf5640a9140880ade98ef85e
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/www-client/w3mmee/files/w3mmee-openssl-1.1.patch b/www-client/w3mmee/files/w3mmee-openssl-1.1.patch
new file mode 100644
index 000000000000..8d7087c93a24
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-openssl-1.1.patch
@@ -0,0 +1,92 @@
+--- a/configure
++++ b/configure
+@@ -1230,7 +1230,7 @@
+ def_param format_nice n
+ def_param id_ext y
+ def_param use_bufinfo y
+-def_param use_egd y
++def_param use_egd n
+ def_param enable_remove_trailingspaces n
+ def_param menu_thin_frame n
+ def_param emacs_like_lineedit $include_opt
+--- a/istream.c
++++ b/istream.c
+@@ -770,7 +770,11 @@
+ 	gn = sk_GENERAL_NAME_value(alt, i);
+ 
+ 	if (gn->type == GEN_DNS) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	  char *sn = ASN1_STRING_data(gn->d.ia5);
++#else
++	  char *sn = ASN1_STRING_get0_data(gn->d.ia5);
++#endif
+ 	  int sl = ASN1_STRING_length(gn->d.ia5);
+ 
+ 	  if (!seen_dnsname)
+--- a/url.c
++++ b/url.c
+@@ -20,8 +20,8 @@
+ #include "regex.h"
+ 
+ #ifdef USE_SSL
+-#ifndef SSLEAY_VERSION_NUMBER
+-#include <crypto.h>		/* SSLEAY_VERSION_NUMBER may be here */
++#ifndef OPENSSL_VERSION_NUMBER
++#include <crypto.h>		/* OPENSSL_VERSION_NUMBER may be here */
+ #endif
+ #include <err.h>
+ #endif
+@@ -126,7 +126,7 @@
+     ssl_accept_this_site(NULL);
+ }
+ 
+-#if SSLEAY_VERSION_NUMBER >= 0x00905100
++#if OPENSSL_VERSION_NUMBER >= 0x00905100
+ #include <rand.h>
+ static void
+ init_PRNG()
+@@ -154,7 +154,7 @@
+     if (file)
+ 	RAND_write_file(file);
+ }
+-#endif				/* SSLEAY_VERSION_NUMBER >= 0x00905100 */
++#endif				/* OPENSSL_VERSION_NUMBER >= 0x00905100 */
+ 
+ static SSL *
+ openSSLHandle(int sock, char *hostname, char **p_cert)
+@@ -188,12 +188,16 @@
+ #endif				/* defined(USE_SSL_VERIFY) */
+     if (ssl_ctx == NULL) {
+ 	int option;
+-#if SSLEAY_VERSION_NUMBER < 0x0800
++#if OPENSSL_VERSION_NUMBER < 0x0800
+ 	ssl_ctx = SSL_CTX_new();
+ 	X509_set_default_verify_paths(ssl_ctx->cert);
+-#else				/* SSLEAY_VERSION_NUMBER >= 0x0800 */
++#else				/* OPENSSL_VERSION_NUMBER >= 0x0800 */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	SSLeay_add_ssl_algorithms();
+ 	SSL_load_error_strings();
++#else
++    OPENSSL_init_ssl(0, NULL);
++#endif
+ 	if (!(ssl_ctx = SSL_CTX_new(SSLv23_client_method())))
+ 	    goto eend;
+ 	option = SSL_OP_ALL;
+@@ -233,13 +237,13 @@
+ 	if (SSL_CTX_load_verify_locations(ssl_ctx, ssl_ca_file, ssl_ca_path))
+ #endif				/* defined(USE_SSL_VERIFY) */
+ 	    SSL_CTX_set_default_verify_paths(ssl_ctx);
+-#endif				/* SSLEAY_VERSION_NUMBER >= 0x0800 */
++#endif				/* OPENSSL_VERSION_NUMBER >= 0x0800 */
+     }
+     handle = SSL_new(ssl_ctx);
+     SSL_set_fd(handle, sock);
+-#if SSLEAY_VERSION_NUMBER >= 0x00905100
++#if OPENSSL_VERSION_NUMBER >= 0x00905100
+     init_PRNG();
+-#endif				/* SSLEAY_VERSION_NUMBER >= 0x00905100 */
++#endif				/* OPENSSL_VERSION_NUMBER >= 0x00905100 */
+     if (SSL_connect(handle) > 0) {
+ 	Str serv_cert = ssl_get_certificate(handle, hostname);
+ 	if (serv_cert) {
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r11.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r11.ebuild
deleted file mode 100644
index 40f99bb5bbd4..000000000000
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r11.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit alternatives multilib toolchain-funcs
-
-MY_PV="${PV##*_}-23"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A variant of w3m with support for multiple character encodings"
-HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"
-SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="w3m"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gpm imlib libressl nls ssl xface"
-
-DEPEND=">=dev-libs/boehm-gc-7.2
-	dev-libs/libmoe
-	dev-lang/perl
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	imlib? (
-		media-libs/imlib
-		xface? ( media-libs/compface )
-	)
-	gpm? ( sys-libs/gpm )
-	nls? ( sys-devel/gettext )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-boehm-gc.patch
-	"${FILESDIR}"/${PN}-gcc-4.4.patch
-	"${FILESDIR}"/${PN}-gcc-4.5.patch
-	"${FILESDIR}"/${PN}-glibc-2.14.patch
-	"${FILESDIR}"/${PN}-rc_name.patch
-	"${FILESDIR}"/${PN}-time.patch
-	"${FILESDIR}"/${PN}-tinfo.patch
-	"${FILESDIR}"/${PN}-w3mman.patch
-)
-DOCS=( ChangeLog NEWS{,.mee} README )
-HTML_DOCS=( 00INCOMPATIBLE.html )
-
-src_prepare() {
-	default
-
-	sed -i "s:/lib\([^a-z$]\):/$(get_libdir)\1:g" configure
-	sed -i "/^AR=/s:ar:$(tc-getAR):" XMakefile
-}
-
-src_configure() {
-	local myconf=(
-		-locale_dir=$(usex nls "${EPREFIX}/usr/share/locale" '(NONE)')
-	)
-	local myuse=(
-		display_code=E
-		system_code=E
-		use_ansi_color=y
-		use_cookie=y
-		use_history=y
-		use_mouse=$(usex gpm y n)
-	)
-
-	if use ssl; then
-		myconf+=(
-			--ssl-includedir="${EPREFIX}/usr/include/openssl"
-			--ssl-libdir="${EPREFIX}/usr/$(get_libdir)"
-		)
-		myuse+=(
-			use_digest_auth=y
-			use_ssl=y
-			use_ssl_verify=y
-		)
-	else
-		myuse+=( use_ssl=n )
-	fi
-	if use imlib; then
-		myuse+=(
-			use_image=y
-			use_w3mimg_fb=n
-			use_w3mimg_x11=y
-			use_xface=$(usex xface y n)
-			w3mimgdisplay_setuid=n
-		)
-	else
-		myuse+=( use_image=n )
-	fi
-
-	cat <<-EOF >> config.param
-	lang=MANY
-	accept_lang=en
-	EOF
-
-	env CC=$(tc-getCC) "${myuse[@]}" ./configure \
-		-nonstop \
-		-prefix="${EPREFIX}/usr" \
-		-suffix=mee \
-		-auxbindir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
-		-libdir="${EPREFIX}/usr/$(get_libdir)/${PN}/cgi-bin" \
-		-helpdir="${EPREFIX}/usr/share/${PN}" \
-		-mandir="${EPREFIX}/usr/share/man" \
-		-sysconfdir="${EPREFIX}/etc/${PN}" \
-		-model=custom \
-		-libmoe="${EPREFIX}/usr/$(get_libdir)" \
-		-mb_h="${EPREFIX}/usr/include/moe" \
-		-mk_btri="${EPREFIX}/usr/libexec/moe" \
-		-cflags="${CFLAGS}" \
-		-ldflags="${LDFLAGS}" \
-		"${myconf[@]}" \
-		|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-
-	# w3mman and manpages conflict with those from w3m
-	mv "${ED}"/usr/share/man/man1/w3m{,mee}.1 || die
-	mv "${ED}"/usr/share/man/ja/man1/w3m{,mee}.1 || die
-
-	docinto html/en
-	dodoc doc/*.html
-	rm -f doc/*.html
-	docinto en
-	dodoc doc/{HISTORY,README,keymap,menu}*
-
-	docinto html/ja
-	dodoc doc-jp/*.html
-	rm -f doc-jp/*.html
-	docinto ja
-	dodoc doc-jp/{HISTORY,README,keymap,menu}*
-}
-
-pkg_postinst() {
-	w3m_alternatives
-	einfo
-	einfo "If you want to render multilingual text, please refer to"
-	einfo "/usr/share/doc/${PF}/en/README.mee or"
-	einfo "/usr/share/doc/${PF}/jp/README.mee"
-	einfo "and set W3MLANG variable respectively."
-	einfo
-}
-
-pkg_postrm() {
-	w3m_alternatives
-}
-
-w3m_alternatives() {
-	if [[ ! -f /usr/bin/w3m ]]; then
-		alternatives_makesym /usr/bin/w3m \
-			/usr/bin/w3m{m17n,mee}
-		alternatives_makesym /usr/bin/w3mman \
-			/usr/bin/w3m{man-m17n,meeman}
-		alternatives_makesym /usr/share/man/ja/man1/w3m.1.gz \
-			/usr/share/man/ja/man1/w3m{m17n,mee}.1.gz
-		alternatives_makesym /usr/share/man/man1/w3m.1.gz \
-			/usr/share/man/man1/w3m{m17n,mee}.1.gz
-		alternatives_makesym /usr/share/man/man1/w3mman.1.gz \
-			/usr/share/man/man1/w3m{man-m17n,meeman}.1.gz
-	fi
-}
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
index 839f8427a0f0..e14ba864eccc 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-gcc-4.4.patch
 	"${FILESDIR}"/${PN}-gcc-4.5.patch
 	"${FILESDIR}"/${PN}-glibc-2.14.patch
+	"${FILESDIR}"/${PN}-openssl-1.1.patch
 	"${FILESDIR}"/${PN}-rc_name.patch
 	"${FILESDIR}"/${PN}-time.patch
 	"${FILESDIR}"/${PN}-tinfo.patch
@@ -77,7 +78,7 @@ src_configure() {
 	else
 		myuse+=( use_ssl=n )
 	fi
-	# Obsolete imlib-1 disabled, bug #678910
+	# bug #678910
 	myuse+=( use_image=n )
 
 	cat <<-EOF >> config.param