gentoo resync : 02.08.2019

4 files changed, 2 insertions, 167 deletions

diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 75ca0026d077..844070a5aded 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,10 +1,7 @@
 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
 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
 DIST lynx2.8.9rel.1.tar.bz2 2689171 BLAKE2B 7cff536660e8fe77d40a56262c2f12e2093ffbb3e22a5ac8e7eab4410f0255e98df19e51f0c98d53aeb3ba63d0d1c2fcabe145242811bebcafb6e548a162a9fb SHA512 61edbe082684fcbd91bdbf4f4d27c3baf92358811aaffc2f8af46adf23ca7b48aede1520fc5f2a8fc974a2f4bbf4e57e7e6027a187bfc6101e56878c98178e6d
 DIST lynx2.9.0dev.1.tar.bz2 2689103 BLAKE2B c82b208e8628efc0f01f35be554fa9c7de0f942cbd76307f7c8aa0d04638a9b89e206e84603c750096036e3469a310d274079caf6a535f15041e119046014845 SHA512 b17361de68fccb8f446210f806fb325468110354858353bc8aaf9b9ae38f9c9f33f592b9fc5ffd31738fe632032cc952347391cd77c5a7b5e5b85be579203e19
-EBUILD lynx-2.8.9_p1.ebuild 2582 BLAKE2B 449e0fcfa6c6515772a5df7c2e13399dc343a24086ea12d370cd21bcadf6b5bd6662cd9c789c11a9d600abf76b925532c3530053630bc31079f6a5718b69d962 SHA512 80ab2c1eb4c465ab2e350441b8d5524b39cceda46a8b2da87a9bd0dc939484995159f8a3c3d55dcb0b0fca8c43e801b2d49af8ef105eb64d0fe9deb18f2471c4
-EBUILD lynx-2.8.9_pre16.ebuild 2587 BLAKE2B 669df01b7963f6e243e682cb82eefb981f0a3a9362635528b041437a38ef88dcaec10aca6c44bac3e1b2c2411c8b014cec4cffe12fe5daa50969020842c0c6b4 SHA512 728ebf3eecf42b39e31c01ed2ce6334f13341610f4c473fa4bc30fd6b87001b0420c15de2ae89e9e43f487f3bdddf6f9dc71a61efb5ff63e94edeefd9592001c
+EBUILD lynx-2.8.9_p1.ebuild 2580 BLAKE2B a6e39ac7607f32bd4863b2e7efffc7de4530a4b57c6ac8759f4c93a2e3be2f2180de2f473211723f5229b406ac13f35eae3b071768856ccbd98baa4036613784 SHA512 924b5ccfd134649226ae053194bd6f4e4dd36f3b3f5292f2547f16adc6b51f1302eb049d9cd20bd47509a5b8202ed28c6fdf3fcb8848718a3b910d164bb560ef
 EBUILD lynx-2.9.0_pre1.ebuild 2601 BLAKE2B f922777936f8b355a699939bf29f256f78cba22adb17af3e6cef9ba65d304274d88035594bcdb08fd02aeaf587e4153ede33225df5d648cbf5d3ad240479de46 SHA512 be8f9b5da3da433eeae99fbf55238148963c3f109139a7019ea1e28c2b6c5ea7232b0b6f58a0f4e3da4e978e764a63761ab92d894b59605e216545d26075785a
 MISC metadata.xml 427 BLAKE2B 12b6661d5a6d2881e78dea8bd97e8ea4f7aa34b2134d2a5a91736c02f2e186fcb4f6c01d704f12bfa9bf0b240e17c11a68a4551087cb1cff1e16e4936bbc125c SHA512 74b58082b7c81f4104e401dd9d958dec9f001ea4e574b8c7d49540c1a11376bfe97d0224e5437291e3cf8eed8aeda2b84669b3ab226b521a7598b51dbc7d48ac
diff --git a/www-client/lynx/files/lynx-2.8.8_p1-parallel.patch b/www-client/lynx/files/lynx-2.8.8_p1-parallel.patch
deleted file mode 100644
index a674520f7159..000000000000
--- a/www-client/lynx/files/lynx-2.8.8_p1-parallel.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- lynx2-8-8/makefile.in
-+++ lynx2-8-8/makefile.in
-@@ -215,10 +215,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) $@
-@@ -258,8 +258,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/*/*~
-@@ -337,7 +337,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 \
- 	'if test -f $(BINDIR)/$(binary_PROG) ; then \
- 	      mv -f $(BINDIR)/$(binary_PROG) $(BINDIR)/lynx.old; fi'
---- lynx2-8-8/src/makefile.in
-+++ lynx2-8-8/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)" \
-@@ -209,7 +209,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_p1.ebuild b/www-client/lynx/lynx-2.8.9_p1.ebuild
index 086d47fc3c7c..011dd1834378 100644
--- a/www-client/lynx/lynx-2.8.9_p1.ebuild
+++ b/www-client/lynx/lynx-2.8.9_p1.ebuild
@@ -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="
diff --git a/www-client/lynx/lynx-2.8.9_pre16.ebuild b/www-client/lynx/lynx-2.8.9_pre16.ebuild
deleted file mode 100644
index 161fd130ac8d..000000000000
--- a/www-client/lynx/lynx-2.8.9_pre16.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# VERSIONING SCHEME TRANSLATION
-# Upstream	:	Gentoo
-# rel.		:	_p
-# pre.		:	_rc
-# dev.		:	_pre
-
-case ${PV} in
-	*_pre*) MY_P="${PN}${PV/_pre/dev.}" ;;
-	*_rc*)  MY_P="${PN}${PV/_rc/pre.}" ;;
-	*_p*|*) MY_P="${PN}${PV/_p/rel.}" ;;
-esac
-
-DESCRIPTION="An excellent console-based web browser with ssl support"
-HOMEPAGE="http://lynx.invisible-island.net/"
-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"
-IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	ssl? (
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-		gnutls? (
-			dev-libs/libgcrypt:0=
-			>=net-libs/gnutls-2.6.4:=
-		)
-	)
-	bzip2? ( app-arch/bzip2 )
-	idn? ( net-dns/libidn )
-"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.6-mint.patch
-	"${FILESDIR}"/${PN}-2.8.8_p1-parallel.patch
-)
-
-pkg_setup() {
-	! use ssl && elog "SSL support disabled; you will not be able to access secure websites."
-}
-
-src_configure() {
-	local myconf=(
-		--enable-nested-tables
-		--enable-cgi-links
-		--enable-persistent-cookies
-		--enable-prettysrc
-		--enable-nsl-fork
-		--enable-file-upload
-		--enable-read-eta
-		--enable-color-style
-		--enable-scrollbar
-		--enable-included-msgs
-		--enable-externs
-		--with-zlib
-		$(use_enable nls)
-		$(use_enable idn idna)
-		$(use_enable ipv6)
-		$(use_enable cjk)
-		$(use_enable unicode japanese-utf8)
-		$(use_with bzip2 bzlib)
-		$(usex ssl "--with-$(usex gnutls gnutls ssl)=${EPREFIX}/usr" "")
-		--with-screen=$(usex unicode "ncursesw" "ncurses")
-	)
-
-	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}"
-
-	sed -i "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \
-			"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
-	if use unicode ; then
-		sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
-				"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
-	fi
-
-	dodoc CHANGES COPYHEADER PROBLEMS README
-	dodoc -r docs lynx_help
-}