gentoo resync : 24.12.2018

3 files changed, 70 insertions, 6 deletions

diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index e352bdc59a70..8c7ee493fa18 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,7 +1,8 @@
 AUX lynx-2.8.6-mint.patch 1001 BLAKE2B 960b2401c262d2b3cb46a443eaa1bf0e8f890745aa2dd8b2455304ff3add46152e3844639fc033d686d0d473e8abc1ba148dbaeecbbd8965e6d941cc75564ca8 SHA512 c3f99d760886139c85aca68d99e4a51d57690c02348c6a5c42bbd640cb848682070e6ca7f13ae7a85ec58659765cb4dc8c58f66919d9276c96dc93f5f31f6674
 AUX lynx-2.8.8_p1-parallel.patch 2112 BLAKE2B 8bba1efae94cf7e55eccdb00692c0a7e3a812480448c58497aec7720301753b988b8c9e1a21e1c50c2e671104fbff7a6c8484f79c0cea16c716e7392d7e28aee SHA512 8578baeb5b8aa1f675b198538b0f111906e202f25bd18bf217c4740d25d59e8a7af9c0fe8570b113c56a6f613f7607a67baa16ea4fc23aa7c846184af2eb696c
-DIST lynx2.8.9dev.11.tar.bz2 2665470 BLAKE2B 3fa28252ff619bc7d82d4e1460b7407b6f2f40bb111b8b54ce478327a023748c51e45dbd8e0ae74daff24d59fc3b6a5776a78057c846b8f3bbb153b4c4b92f17 SHA512 702be6cb4f97bae4765d3de3d6ef1cd09e2ef27b570dfbea4f26a411f5bba2ab6d16aee5dbec0ebe63533de17664684ff42fb857b2d17d416774777b38083f50
+AUX lynx-2.8.9_p1-parallel.patch 2127 BLAKE2B f78dd62fdf81dfa3403ad358286dc2e27d76b2bb7a65d877317a22635931499687ac75fea6d02866295a65851cfcd7c5ebf5474e1120104d998119eed132e82b SHA512 fe5ea8caab053c0d4240d34c63ee7cfb81254851eaad7e206e2b840b963ad160982566ba5cbee5fa98c732b3ddd3ff8ed88e3b2b8e6328aaa9d8b5350e2d97bc
 DIST lynx2.8.9dev.16.tar.bz2 2674662 BLAKE2B 3771199e4d74dcc38c15b8b75207810d3a4f3afabb76d5d8dc7dcd33c5dd0119f0f28a1a719f54df7ed0ecdfb972942c6439536486f99a685febbc252127cc3f SHA512 6aa5e869924c6e42aa68113985aecfb75dc6eb68d5d7db8cedb9843621d29c36c17078e7a692f472e3e7f1edf7ca666e3614bc3bdb092a3631877733d5e3d518
-EBUILD lynx-2.8.9_pre11.ebuild 2474 BLAKE2B 55f353231ff7bc0551a6fec2c77e14f448db280842ad2e255479323422d3386c854067807c6df9b4bdb78511ab82637d65e1f250a6c1aaf6d9812abd884b7263 SHA512 9a343cbe5f5bc0350eaaf347e92415b9227877302bda4267f5e9ccb3e0cc4f694e043b6b5d2615b383c1aa474125b75e4d6e91483b4fbf4429fc9db72aa28db8
+DIST lynx2.8.9rel.1.tar.bz2 2689171 BLAKE2B 7cff536660e8fe77d40a56262c2f12e2093ffbb3e22a5ac8e7eab4410f0255e98df19e51f0c98d53aeb3ba63d0d1c2fcabe145242811bebcafb6e548a162a9fb SHA512 61edbe082684fcbd91bdbf4f4d27c3baf92358811aaffc2f8af46adf23ca7b48aede1520fc5f2a8fc974a2f4bbf4e57e7e6027a187bfc6101e56878c98178e6d
+EBUILD lynx-2.8.9_p1.ebuild 2591 BLAKE2B 744e0d7292f8a31dcba8b4efdf9620ddb8c0af86438aec6d6c8950a9a8f849b2663c187ec8aa0b8cab50ea8e28682b82f533d5f3ead3ffe376f7d59efcf32a79 SHA512 e7e85a445d3fbaa7ff5111ecd33e5ed23a54ac072c8021471a589ba0c5130d08558d8ef1f6df1a782fa1dfca141d0e8418d56c0569484bb6135e5c7e5267332f
 EBUILD lynx-2.8.9_pre16.ebuild 2591 BLAKE2B 559f8a7080aef6f28af7195f034e873c89b38c76b560f63722f0702efd1a0d20fce23052a8b590d9751e6f60ad24bf31371f3542862e30cf530b7e749dc70196 SHA512 e0cd8442843fe71cde0458ed9027e7ff9558ab6430c2c0729f9ec6b525faa90b72f1c7e80712d01e212d63aafc844ec26f50d161b412e1bbd424c79a3ffd6408
 MISC metadata.xml 427 BLAKE2B 12b6661d5a6d2881e78dea8bd97e8ea4f7aa34b2134d2a5a91736c02f2e186fcb4f6c01d704f12bfa9bf0b240e17c11a68a4551087cb1cff1e16e4936bbc125c SHA512 74b58082b7c81f4104e401dd9d958dec9f001ea4e574b8c7d49540c1a11376bfe97d0224e5437291e3cf8eed8aeda2b84669b3ab226b521a7598b51dbc7d48ac
diff --git a/www-client/lynx/files/lynx-2.8.9_p1-parallel.patch b/www-client/lynx/files/lynx-2.8.9_p1-parallel.patch
new file mode 100644
index 000000000000..c4196af3b45e
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.8.9_p1-parallel.patch
@@ -0,0 +1,57 @@
+--- lynx2.8.9rel.1/makefile.in
++++ lynx2.8.9rel.1/makefile.in
+@@ -200,10 +200,10 @@
+ 
+ all lynx$x: cfg_defs.h LYHelp.h
+ @MSG_DIR_MAKE@	$(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
+-@MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR)
+-	cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS)
+-	cd $(CHR_DIR) && $(MAKE_RECUR) all $(CHR_CFLAGS)
+-	cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS)
++@MSG_DIR_MAKE@	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR)
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $(WWW_CFLAGS)
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(CHR_DIR) all $(CHR_CFLAGS)
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) all $(SRC_CFLAGS)
+ 
+ lint:
+ 	cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@
+@@ -241,8 +241,8 @@
+ 	rm -f core *.core
+ 
+ depend: cfg_defs.h LYHelp.h
+-	cd $(WWW_DIR) && $(MAKE_RECUR) $@
+-	cd $(SRC_DIR) && $(MAKE_RECUR) $@
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $@
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) $@
+ 
+ distclean: clean
+ 	-rm -f WWW/Library/*/*~
+@@ -297,7 +297,7 @@
+ 	@echo Full installation complete.
+ 
+ install-bin: $(BINDIR) lynx$x
+-@MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR) install
++@MSG_DIR_MAKE@	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR)
+ 	@ECHO_CC@$(SHELL) -c "P=$(binary_PROG); \
+ 	if test -f $(BINDIR)/$$P ; then \
+ 	      mv -f $(BINDIR)/$$P $(BINDIR)/$$P.old; fi"
+--- lynx2.8.9rel.1/src/makefile.in
++++ lynx2.8.9rel.1/src/makefile.in
+@@ -118,7 +118,7 @@
+ 	@echo "Compiling Lynx sources"
+ 
+ do_chartrans_stuff:
+-	-cd chrtrans && $(MAKE_RECUR) \
++	-$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans \
+ 		SITE_DEFS="$(SITE_DEFS)" \
+ 		BUILD_CFLAGS="$(BUILD_CFLAGS)" \
+ 		BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
+@@ -210,7 +210,7 @@
+  $(CHRTR)viscii_uni.h
+ 
+ $(TABLES):
+-	-cd chrtrans && $(MAKE_RECUR) tables
++	-$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans tables
+ 
+ UCdomap$o :	UCdomap.c \
+ 		chrtrans/UCkd.h \
diff --git a/www-client/lynx/lynx-2.8.9_pre11.ebuild b/www-client/lynx/lynx-2.8.9_p1.ebuild
index bb66030dcc34..1d868b5c7b89 100644
--- a/www-client/lynx/lynx-2.8.9_pre11.ebuild
+++ b/www-client/lynx/lynx-2.8.9_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="http://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
 
 RDEPEND="
@@ -39,7 +39,7 @@ RDEPEND="
 		)
 	)
 	bzip2? ( app-arch/bzip2 )
-	idn? ( net-dns/libidn )
+	idn? ( net-dns/libidn:0= )
 "
 
 DEPEND="${RDEPEND}
@@ -50,7 +50,7 @@ S=${WORKDIR}/${MY_P}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.6-mint.patch
-	"${FILESDIR}"/${PN}-2.8.8_p1-parallel.patch
+	"${FILESDIR}"/${P}-parallel.patch
 )
 
 pkg_setup() {
@@ -84,6 +84,12 @@ src_configure() {
 	econf "${myconf[@]}"
 }
 
+src_compile() {
+	# generating translation files in parallel is currently broken
+	use nls && emake -C po -j1
+	emake
+}
+
 src_install() {
 	emake install DESTDIR="${D}"