gentoo auto-resync : 14:10:2022 - 07:43:49

5 files changed, 39 insertions, 127 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 42433264c4a6..433fd157f5aa 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 9a03fe250c5e..4453bec0e0ad 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,9 +1,8 @@
-AUX lynx-2.8.6-mint.patch 1001 BLAKE2B 960b2401c262d2b3cb46a443eaa1bf0e8f890745aa2dd8b2455304ff3add46152e3844639fc033d686d0d473e8abc1ba148dbaeecbbd8965e6d941cc75564ca8 SHA512 c3f99d760886139c85aca68d99e4a51d57690c02348c6a5c42bbd640cb848682070e6ca7f13ae7a85ec58659765cb4dc8c58f66919d9276c96dc93f5f31f6674
-AUX lynx-2.8.9_p1-parallel.patch 2127 BLAKE2B f78dd62fdf81dfa3403ad358286dc2e27d76b2bb7a65d877317a22635931499687ac75fea6d02866295a65851cfcd7c5ebf5474e1120104d998119eed132e82b SHA512 fe5ea8caab053c0d4240d34c63ee7cfb81254851eaad7e206e2b840b963ad160982566ba5cbee5fa98c732b3ddd3ff8ed88e3b2b8e6328aaa9d8b5350e2d97bc
 AUX lynx-2.9.0_pre9-mint.patch 434 BLAKE2B 90b070232eca8f6e8b1cbbd44aff0f6a9c9403c1321db54b14fc468845248285b45dc5a8e57e1ce9021b4ffe517814c5c0ae7c1c270d7db8c1790b417b2806cb SHA512 0ca26d35c8f5493e720913caf5289e89ec7238b0615a7b4198c8cd1e070afc3f776c8e5bdabbf6d252a4060b486e0333f2f94244163413443504979f5cf32fcc
 AUX lynx-2.9.0_pre9-parallel.patch 2625 BLAKE2B aca2c28c6d73f0b22fe378fdad533264580b9cbbf4fc27b780f6063791b473c10b968a5d20a7d0224006b9a8f2446d2a5e49d82b5ebf6dd72ea27c0439f4ecb1 SHA512 e5bc3076deb0766a5c9f388f92d9aed13e20f01a2e5713bb0c17f3bc20c0949e81d5fa399ceb0941dafaa7e54fbcae39617a135fcad233a384b1d7c366a31e70
-DIST lynx2.9.0dev.6.tar.bz2 2730690 BLAKE2B 2b176db49ac053e6c057b366b625883f0877f0bbf9bc2fbc0dfe6a13af48e0c9d5a64de52e794a4e771d7f6b160c74589a9275543f2657cb678bba149cdba38c SHA512 0c15e00a8e36e43671a093182c69593d50bc5c51a4acd92faa59416055bf4a1fd9ecde903a0209963f1f55d1fd85136e8448ca7867e198100ff749c53e1e1531
+DIST lynx2.9.0dev.10.tar.bz2 2748823 BLAKE2B d4d5625091dd19fcbb245b51faca0913241491cc5c176702d04fb967abd960cee8a70ceb0fe769978a954cbf8a3bb3eae6cf096e2af600cb5916988a183479bd SHA512 afc8bbd241045a530d2c869b268fce708077024fea4363902d258a174994424e6cc64f066c63db82f08bb7e368647cbed1d420d596a494982f09ae05ec9e8bf5
+DIST lynx2.9.0dev.10.tar.bz2.asc 729 BLAKE2B 80c7cfa5e91e3b66af3bce2034c435e3bebbd4601034887bafdcad910619fc7141108f994ad4b095b28042e1f412549ab57182da09710f22e1a37f3249204c12 SHA512 386f1ce3d65db6275f999c3e6b9e4af31ca1f8c7bd2577fa0d130df3eb15685c0badc92b1b853805151b30ddda35f6423ad89f62b4983ad102ede770d6b15e60
 DIST lynx2.9.0dev.9.tar.bz2 2746988 BLAKE2B 6b5658b6bc224d02fe89fe31a1b8cdac5f736d68545fb6508f3a3b83e9c7537599dbacf5000320a019f0fab1059d5d4516e8d54341ef7d3384605d9e2f3c19da SHA512 ad343a7bc254cf287accde305db556101f7fa0f081e7c1c4327d7a4366c74cdbfb03ec003b0bc176768bbe726eae3e1bf8361416e0364ccdfe40d63fbc5b6dc4
-EBUILD lynx-2.9.0_pre6-r2.ebuild 2536 BLAKE2B 2e56c0a17e40ccba0f78199c3ff7bef7362b8b42d5ef42c1ed7792aa0e1fde92d20c70fdebe9e835083770f155bd0a84cc2ba9d40c1e270196aac8b38bc73247 SHA512 2d9aaa442037c25d0ea67bbd2acbc80361dbba7ebe6f27ed2525f74f6aff594b490bffe3aac9a1791d5470f832cc062151b022e193579b187af9935d25061a89
+EBUILD lynx-2.9.0_pre10.ebuild 2703 BLAKE2B 74dbfcec7bd3895f9d93f1fb33b08dcdc9f277ce190f2c7122d53bb72e8ba7b16ee9bdf6c4298121428c1935a6bc00f8e54e0e1a737f6a8c3cc6e732ee9079a8 SHA512 78c33b03d219fb78c0e74d0f571a19d9a9368fba2505faca5e43227f2153919bc16cbff041a4c09e642f58b1ddd3260a55772e7037ffd1326ba23396e581dc59
 EBUILD lynx-2.9.0_pre9.ebuild 2431 BLAKE2B 433087b1de3ccabb65d95a8006f2bcd4c1fb3e761f0bda24e35f2ac67e1b8914597d8529632616831cc85566825f90434a191a6c56c22ad9e75f20ae6ea514fc SHA512 8a45029298dfe9f27d2461be8814d78d6ac70f6ca25443e8d882f9117e10fa34bbf4e9ac0d5ec487bed58a3d41b182bd59b7ddc1b46f4a93e322f064204cb8a3
 MISC metadata.xml 521 BLAKE2B 1c520669081f0dfd89ddc4a9a9c121e02fa4e184d28ed796b7e8e160affff889cefedd23b4a0f38d4d4acd2c9e2e8426715a0b8d0f37fa14d4d12fb4f063a9d8 SHA512 2192536d199e0e00dc2add38560b72c8a772966192f394704bc9410674b413791d2d262fefe729a32726f2c9b166f52f7af54d5d71f0868072853c3cfea151b1
diff --git a/www-client/lynx/files/lynx-2.8.6-mint.patch b/www-client/lynx/files/lynx-2.8.6-mint.patch
deleted file mode 100644
index 3c7987718c64..000000000000
--- a/www-client/lynx/files/lynx-2.8.6-mint.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- lynx2-8-6/src/UCdomap.h.old	2009-03-18 08:16:12.000000000 +0000
-+++ lynx2-8-6/src/UCdomap.h	2009-03-18 08:15:12.000000000 +0000
-@@ -172,6 +172,18 @@
-        0, 128,UCT_ENC_UTF8,-4)
- #endif
- 
-+#ifndef NO_CHARSET_windows_1250
-+#define NO_CHARSET_windows_1250 !ALL_CHARSETS
-+#endif
-+
-+#if NO_CHARSET_windows_1250
-+#define UC_CHARSET_SETUP_windows_1250	/* nothing */
-+#else
-+/* Is this right ??? */
-+#define UC_CHARSET_SETUP_x_transparent UC_Charset_NoUctb_Setup("windows-1250","windows-1250",\
-+       0, 128,UCT_ENC_8BIT,0)
-+#endif
-+
- #ifdef __cplusplus
- }
- #endif
---- lynx2-8-6/WWW/Library/Implementation/www_tcp.h.old	2009-03-18 06:45:10.000000000 +0000
-+++ lynx2-8-6/WWW/Library/Implementation/www_tcp.h	2009-03-18 06:45:22.000000000 +0000
-@@ -94,7 +94,7 @@
- # endif
- #endif /* HAVE_DIRENT_H */
- 
--#if !(defined(DOSPATH) || defined(__EMX__) || defined(__CYGWIN__))
-+#if !(defined(DOSPATH) || defined(__EMX__) || defined(__CYGWIN__) || defined(__MINT__))
- #define STRUCT_DIRENT__D_INO 1
- #endif
- 
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
deleted file mode 100644
index c4196af3b45e..000000000000
--- a/www-client/lynx/files/lynx-2.8.9_p1-parallel.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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.9.0_pre6-r2.ebuild b/www-client/lynx/lynx-2.9.0_pre10.ebuild
index 6818ac17dadf..2e7cf9e38eb8 100644
--- a/www-client/lynx/lynx-2.9.0_pre6-r2.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre10.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
 
 case ${PV} in
 	*_pre*) MY_P="${PN}${PV/_pre/dev.}" ;;
@@ -11,63 +14,64 @@ esac
 
 DESCRIPTION="An excellent console-based web browser with ssl support"
 HOMEPAGE="https://lynx.invisible-island.net/"
-SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
+SRC_URI="https://invisible-mirror.net/archives/${PN}/tarballs/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( https://invisible-mirror.net/archives/${PN}/tarballs/${MY_P}.tar.bz2.asc )"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 cjk gnutls idn nls ssl"
 
 RDEPEND="
-	sys-libs/ncurses:=[unicode(+)?]
+	sys-libs/ncurses:=[unicode(+)]
 	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	idn? ( net-dns/libidn:= )
 	nls? ( virtual/libintl )
 	ssl? (
 		!gnutls? (
-			dev-libs/openssl:0=
+			dev-libs/openssl:=
 		)
 		gnutls? (
-			dev-libs/libgcrypt:0=
+			dev-libs/libgcrypt:=
 			>=net-libs/gnutls-2.6.4:=
 		)
-	)
-	bzip2? ( app-arch/bzip2 )
-	idn? ( net-dns/libidn:0= )
-"
-
-DEPEND="${RDEPEND}
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.6-mint.patch
-	"${FILESDIR}"/${PN}-2.8.9_p1-parallel.patch
+	"${FILESDIR}/${PN}-2.9.0_pre9-mint.patch"
+	"${FILESDIR}/${PN}-2.9.0_pre9-parallel.patch"
 )
 
 src_configure() {
 	local myconf=(
-		--enable-nested-tables
 		--enable-cgi-links
+		--enable-color-style
+		--enable-externs
+		--enable-file-upload
+		--enable-included-msgs
+		--enable-ipv6
+		--enable-nested-tables
+		--enable-nsl-fork
 		--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-screen=ncursesw
 		--with-zlib
-		$(use_enable nls)
-		$(use_enable idn idna)
-		$(use_enable ipv6)
 		$(use_enable cjk)
-		$(use_enable unicode japanese-utf8)
+		$(use_enable idn idna)
+		$(use_enable nls)
 		$(use_with bzip2 bzlib)
-		--with-screen=$(usex unicode ncursesw ncurses)
 	)
+
 	if use ssl; then
 		myconf+=(
 			--with-$(usex gnutls gnutls ssl)="${EPREFIX}/usr"
@@ -94,10 +98,8 @@ src_install() {
 
 	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
+	sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
+			"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
 
 	dodoc CHANGES COPYHEADER PROBLEMS README
 	dodoc -r docs lynx_help