gentoo resync : 10.02.2020

6 files changed, 62 insertions, 26 deletions

diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 064e8a9e3c83..a6f96dafd242 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,9 +1,11 @@
 AUX dillo-3.0.5-fno-common.patch 2234 BLAKE2B be7c3073e370c8c65fa4cda31739755db678d3dc37564d0635fd03a9fbcdc25f07082a203297c69a74f7557588f7c7149ad59a9ad9a78ab1780a9bc660754259 SHA512 854ee60ecb5b60e5c3f2e5ee22e2e8b29d1ef64052c46055e4a6aa8eafdb31fe7073fec3fda9851de3929c5f73ddc010bf4f2d18cb0036a7df3d453930563000
+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.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7ec67018b17044a417209954d67f22e2000b0871d315a25388bacffab9599230fc9615877a2f08 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833
-EBUILD dillo-3.0.5-r1.ebuild 1366 BLAKE2B d2643e53e81ea793f48962226c23a71c91805ac1b4e51c80a3daff34817db9f085d40eeacb1e5a9cec7d7defbc7a0d685c46fd74e79dd2b21adc525bfb715fa4 SHA512 094c790948088f24dd89f32c115ff89e6d7c31bfcb196368bfbca1c15ddb3842600062d16a6d75358330496dab7be6012d7a309106d238128073b8ea68ef9400
-EBUILD dillo-3.0.5-r2.ebuild 1239 BLAKE2B 3909148cfd43055167ce795e22a6aeea15207684fe4c66cfdc7d4d329005ee096b2e56d5046732b6219440a756a15c9787615c68f1e545309ac136c039df9c17 SHA512 60f3deefbd7a962eed80e3cb1f185aeb40e155d7c78929fa6ebd4587e33afdb877a64fadce58edce5de99b628245c495d0ac83700f92e082d50d9a9294e69ee8
+EBUILD dillo-3.0.5-r3.ebuild 1335 BLAKE2B 3d96f5c1afe9d0cb180ada46529fdf8b4142c9c1ebd920c5e4daf4aba6afa6cc0a50bcd5fb9a0e47824d8aa8f5f7c1a12aabd87cf3edede52a596880621e3fe3 SHA512 6e093c68d95911a8ab088a0d758587c6e7321433e0e672c0f65d37c9f78c67a5bea5c835d7f534d368eca7a7ca528dfffc1a76abec3122c64dcec5f1193b8b5a
 EBUILD dillo-3.0.5.ebuild 1298 BLAKE2B 6f73df054852d4287c5bc2706bf1e0a41780df62c754f8a518e3637fb35f9aa83e29b180778bc34e8eb57d2395fd3c87ba3c210c7a48477be43e46de30eceb5b SHA512 b4e15989f992691899a8b67ff392d04c48ee196b7817b8b2e74d0d17a236ed2432752f276c37bfd0eca4097086c23343e7a8869bdaf9547d61dd15f7fc61187f
-EBUILD dillo-9999.ebuild 1156 BLAKE2B 591195d6467ff26f08df6419636b8f14ed733afc164340c85c5ce1142b0a53851de7294d5a0194623e43e1bab647966728eed015a5a26bc253961f5e7f81b13c SHA512 8b25bed5910d130cc83fe51ebbcbb4104d71672fcf0fd8556e81eac157862c7163f435dc29c0adddffd4946bdaeaf461497b4e4852a19a0f3d867d5e3f05baac
-MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
+EBUILD dillo-3.1_p20181005.ebuild 1235 BLAKE2B 97281d6c02379e026dd4c7e1d18804d945b88fe706862ad9fa76914c7e507716101c6faf5e5b1ced426a0db9a4ccb2fe4eb6541c3ddfc2a149f353b5c170499f SHA512 f3e6352a1a726bbe58cf12beb3521dbba3e2c6d87873cc5b2a91ce010addc233246a57ddfb781df0496bbf79a0da2f32bf1e47bdb1fd1491fb2c26b961a68bdd
+EBUILD dillo-9999.ebuild 1189 BLAKE2B 0fa0b3efea2ba78c5fbb49ca207d9bd2e7cc2d55d3b0677f914aefa2418a3ec55d9dfff4efbb8c5f66b2b5f4b610ca85228fd59aaa08aaf648a9bd73562833f1 SHA512 f7009d1751ece14d3aadfdcf4b0c34c74c0a6962e6d79c926045ec951353353283d53ec16b6bea0e4000f92cefacd30c686588043fe163f63be676c43c70515d
+MISC metadata.xml 348 BLAKE2B 4574707b617c7f7567075d5cee2ede78364c7b5b5ed11977e2948b2df2afc27506418b20db8bbbc371f1e9e2ef095d2376c869ddba3374a0e76ebdac4de9fc84 SHA512 e2ba8ac70b1ac89f257e92f457b20bc4fb9b407b5f49d1026c54dcd0d833f149e3961c732dcfb54d8d4886f417d480f49e76e89b93045a88ce1efed015739892
diff --git a/www-client/dillo/dillo-3.0.5-r2.ebuild b/www-client/dillo/dillo-3.0.5-r3.ebuild
index 14d9e245482d..f2cd65be706a 100644
--- a/www-client/dillo/dillo-3.0.5-r2.ebuild
+++ b/www-client/dillo/dillo-3.0.5-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit desktop multilib toolchain-funcs
+inherit autotools desktop multilib toolchain-funcs
 
 DESCRIPTION="Lean FLTK based web browser"
 HOMEPAGE="https://www.dillo.org/"
@@ -33,9 +33,15 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}2-inbuf.patch
 	"${FILESDIR}"/${PN}-3.0.5-fno-common.patch
+	"${FILESDIR}"/${PN}-3.0.5-openssl-1.1.patch
 )
 DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf  \
 		$(use_enable gif) \
diff --git a/www-client/dillo/dillo-3.0.5-r1.ebuild b/www-client/dillo/dillo-3.1_p20181005.ebuild
index 655d5ad63cd5..80b643685578 100644
--- a/www-client/dillo/dillo-3.0.5-r1.ebuild
+++ b/www-client/dillo/dillo-3.1_p20181005.ebuild
@@ -1,36 +1,41 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib toolchain-funcs
+EAPI=7
+inherit autotools desktop 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"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${P}.tar.xz
+	mirror://gentoo/${PN}.png
+"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gif ipv6 +jpeg libressl +png ssl"
+IUSE="doc +gif ipv6 +jpeg +png ssl +xembed"
 
 RDEPEND="
 	>=x11-libs/fltk-1.3
 	sys-libs/zlib
 	jpeg? ( virtual/jpeg:0 )
 	png? ( >=media-libs/libpng-1.2:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
+	ssl? ( net-libs/mbedtls:= )
 "
 DEPEND="
 	${RDEPEND}
 	doc? ( app-doc/doxygen )
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}2-inbuf.patch
+	"${FILESDIR}"/${PN}-3.0.5-fno-common.patch
+)
+DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}2-inbuf.patch
+	default
+	eautoreconf
 }
 
 src_configure() {
@@ -40,6 +45,7 @@ src_configure() {
 		$(use_enable jpeg) \
 		$(use_enable png) \
 		$(use_enable ssl) \
+		$(use_enable xembed) \
 		--docdir="/usr/share/doc/${PF}"
 }
 
@@ -51,18 +57,10 @@ src_compile() {
 }
 
 src_install() {
-	dodir /etc
 	default
 
-	use doc && dohtml html/*
-	dodoc AUTHORS ChangeLog README NEWS
-	dodoc doc/*.txt doc/README
+	use doc && dodoc -r html
 
 	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-9999.ebuild b/www-client/dillo/dillo-9999.ebuild
index 7134cc059e28..7269ff96157b 100644
--- a/www-client/dillo/dillo-9999.ebuild
+++ b/www-client/dillo/dillo-9999.ebuild
@@ -12,7 +12,7 @@ EHG_REPO_URI="https://hg.dillo.org/dillo"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +gif ipv6 +jpeg +png ssl"
+IUSE="doc +gif ipv6 +jpeg +png ssl +xembed"
 
 RDEPEND="
 	>=x11-libs/fltk-1.3
@@ -43,6 +43,7 @@ src_configure() {
 		$(use_enable jpeg) \
 		$(use_enable png) \
 		$(use_enable ssl) \
+		$(use_enable xembed) \
 		--docdir="/usr/share/doc/${PF}"
 }
 
diff --git a/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch b/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch
new file mode 100644
index 000000000000..f21694113c2b
--- /dev/null
+++ b/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch
@@ -0,0 +1,26 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -286,7 +286,7 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto)
++    AC_CHECK_LIB(ssl, OPENSSL_config, ssl_ok=yes, ssl_ok=no, -lcrypto)
+     LIBS="$old_libs"
+   fi
+ 
+--- a/dpi/https.c
++++ b/dpi/https.c
+@@ -476,7 +476,11 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+          if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++#else
++         if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
++#endif
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
+
diff --git a/www-client/dillo/metadata.xml b/www-client/dillo/metadata.xml
index bc1b97e1eb76..44685422a58c 100644
--- a/www-client/dillo/metadata.xml
+++ b/www-client/dillo/metadata.xml
@@ -5,4 +5,7 @@
     <email>desktop-misc@gentoo.org</email>
     <name>Gentoo Desktop Miscellaneous Project</name>
   </maintainer>
+<use>
+<flag name='xembed'>Enable X11 XEmbed support</flag>
+</use>
 </pkgmetadata>