gentoo resync : 25.08.2020

4 files changed, 4 insertions, 70 deletions

diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 86e51a228526..1a446f7d5561 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -2,10 +2,9 @@ AUX dillo-3.0.5-fno-common.patch 2234 BLAKE2B be7c3073e370c8c65fa4cda31739755db6
 AUX dillo-3.0.5-openssl-1.1.patch 806 BLAKE2B 4f7857a6fff86292692d7b7b2c9fc22b11a6db9e5a8f02c6bf43c7f4b6e4575a6cdcde1506ff748f37e1edfc40b06b4f1203b173624a8c6c15230dc2b2a6f3f3 SHA512 c62b9473847cfaee835a1d9c0f83f8b73c05488a0db1ba5fbc3b5719efcd251c2a218221bcb3b8fed1a65feceeefc4c57c31c444fea82a7bf1a12cddbba83af1
 AUX dillo2-inbuf.patch 313 BLAKE2B f3924f38da743bc843142106853b4fc704a9ffc8efe8d74d463fdf09c02bcf7ecff46d04787e7c6fd79a4797c4f239dcd746a73cb47adc36bc6a663169611bde SHA512 d68a21d64eb81341afdccdf1e409e6d12ca88ee2f016b327365b36ff71e015aa38e325b6127f77e45a6d995f38b9a88e90fb375145342fb8d29731ce2105c9ae
 DIST dillo-3.0.5.tar.bz2 734472 BLAKE2B c8a7ac3a875740d2d64269b0d368e6f9395c89a56737dda9d6dcb013f5d46631e4f6f68e251f7104c0ec9bbb14bcc10b67a7f519558f857743d7cf15976f197c SHA512 d0e86f57e50da762debf592b6deb94de5ee58f84e0cae1159890262540a463aea8143d2b99c634021c1f273f91c2fe0918f30d72c3eaf91fdb541e741469b155
-DIST dillo-3.1_p20181005.tar.xz 907520 BLAKE2B 1349ca1de53b294b5c31088ce36b3f9a86c3e628cfce41fa4fcfa30a3b4d9ed05b0be836fbc2ea2f2c37fce3ff28b17766d0717949d1ec66430149049751fa50 SHA512 1accbf200bd17a04d3b758037e11b0c21924c93d7857fa5c880af471cf180d45d5c772c6d800b4b899cf5b43bde640d28b37ce82fcf6b916c9adee5800e57d29
+DIST dillo-3.1_pre20181005.tar.xz 907752 BLAKE2B a894583e2c50baf2c2ff615dadfbe79e7652154cc0f7b80a4253d27dbe2e5463fa9c7a44622a6cfdcc60822cee0e1c38c31231b5bc5ee9c7b22bb16a15cc8c90 SHA512 f1916c6261bfcae9264037eaee37497660e43e46641c42fbcc9c2592fa41602a83fc91ddce6aeabc0122c575bcff72339d181210f3039e5d4c5a7c25f88aa642
 DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7ec67018b17044a417209954d67f22e2000b0871d315a25388bacffab9599230fc9615877a2f08 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833
-EBUILD dillo-3.0.5-r3.ebuild 1299 BLAKE2B 376c5b594defc23ed28d97f1c48d74d84d99d8d54f182cc106b8345cfba9f9b0c7530afde73814cec69b53e324e1b78321f25034c4d66695cb0770596f89384c SHA512 bbd538a50036d3f6232323a44b2755dc82997001c43a5f754b35520b177870f35dc4c7ffc58af094a1349beed6290a4cd976ff12f364908148e7b26d566f64df
-EBUILD dillo-3.0.5.ebuild 1295 BLAKE2B a125005c5a89b9b265f6fe047e1e033b36e4d73c39e3b9ae90c954ebf0066e390eb217c65ad5c062cbe09029c71ba8ba5891a9cd436eed8ab7fa3e5095941893 SHA512 3b4c8e1c0a0503fc926e21441e878dba0e8a94db52548caf56ebc68d6305d61e771a70b02310b332e89d34e3e85e2821399ded117ea40819c67d3e39fe9779f3
-EBUILD dillo-3.1_p20181005.ebuild 1199 BLAKE2B 09e1bf6a220bc19a03f79c54b0d7f49bf345aa9d53424f691e4b2b4967a0fcad7eca6af17b6927321522af4deb3599936e88e333723d968b87bb288e4a1e1ffa SHA512 e3683e3ac46bac4947a1a87a2aeacb01647dddcf9b5fdea58fe0bffc4db6f7a621169f4180d41a3760f6c8ca0ed8a750202853e487b7f22af3f400cb7ce888d9
+EBUILD dillo-3.0.5-r3.ebuild 1293 BLAKE2B 019a0535baead78934decc1e7840031d9147c95663804db672565825fdf02d8a26e6685eb3c36ad781defbd28ecf8537649ce96a0660ebbc4f5be26f43154703 SHA512 b670000f0b732c520a177c8dc047c6737edff432be389268094df54ab3cd3b7914272845d9a3d39ec49b8443adac54ca036eb047ad5d3665bdb7131e0749b68b
+EBUILD dillo-3.1_pre20181005.ebuild 1199 BLAKE2B 09e1bf6a220bc19a03f79c54b0d7f49bf345aa9d53424f691e4b2b4967a0fcad7eca6af17b6927321522af4deb3599936e88e333723d968b87bb288e4a1e1ffa SHA512 e3683e3ac46bac4947a1a87a2aeacb01647dddcf9b5fdea58fe0bffc4db6f7a621169f4180d41a3760f6c8ca0ed8a750202853e487b7f22af3f400cb7ce888d9
 EBUILD dillo-9999.ebuild 1153 BLAKE2B 8c859ca6a5d600ef275efcf30cc36352ef7b761d6971dea299cd45e19c209ccde9402e41652a6f79b7913952d8bd88b9d8b3df49e40277c46d45299be4f90468 SHA512 695e0cac6fb25b75055d8c19a77e14d5c4c6dada6af22ab0904fe43d93b96bf1c1550c170385a0a2c1243b40d0e57ea68088069025bf9d60ebc2780eb5acfbfe
 MISC metadata.xml 348 BLAKE2B 4574707b617c7f7567075d5cee2ede78364c7b5b5ed11977e2948b2df2afc27506418b20db8bbbc371f1e9e2ef095d2376c869ddba3374a0e76ebdac4de9fc84 SHA512 e2ba8ac70b1ac89f257e92f457b20bc4fb9b407b5f49d1026c54dcd0d833f149e3961c732dcfb54d8d4886f417d480f49e76e89b93045a88ce1efed015739892
diff --git a/www-client/dillo/dillo-3.0.5-r3.ebuild b/www-client/dillo/dillo-3.0.5-r3.ebuild
index 956787d22bf5..dc3304500ca5 100644
--- a/www-client/dillo/dillo-3.0.5-r3.ebuild
+++ b/www-client/dillo/dillo-3.0.5-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="doc +gif ipv6 +jpeg libressl +png ssl"
 
 RDEPEND="
diff --git a/www-client/dillo/dillo-3.0.5.ebuild b/www-client/dillo/dillo-3.0.5.ebuild
deleted file mode 100644
index eb9cf5a8348a..000000000000
--- a/www-client/dillo/dillo-3.0.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Lean FLTK based web browser"
-HOMEPAGE="https://www.dillo.org/"
-SRC_URI="https://www.dillo.org/download/${P}.tar.bz2
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 sparc x86"
-IUSE="doc +gif ipv6 +jpeg +png ssl"
-
-RDEPEND="
-	>=x11-libs/fltk-1.3
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
-	png? ( >=media-libs/libpng-1.2:0 )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}2-inbuf.patch
-}
-
-src_configure() {
-	econf  \
-		$(use_enable gif) \
-		$(use_enable ipv6) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable ssl) \
-		--docdir="/usr/share/doc/${PF}"
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	dodir /etc
-	default
-
-	use doc && dohtml html/*
-	dodoc AUTHORS ChangeLog README NEWS
-	dodoc doc/*.txt doc/README
-
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} Dillo
-}
-
-pkg_postinst() {
-	elog "Dillo has installed a default configuration into /etc/dillo/dillorc"
-	elog "You can copy this to ~/.dillo/ and customize it"
-}
diff --git a/www-client/dillo/dillo-3.1_p20181005.ebuild b/www-client/dillo/dillo-3.1_pre20181005.ebuild
index f918f45287e4..f918f45287e4 100644
--- a/www-client/dillo/dillo-3.1_p20181005.ebuild
+++ b/www-client/dillo/dillo-3.1_pre20181005.ebuild