gentoo resync : 13.10.2019

6 files changed, 105 insertions, 8 deletions

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 4843ed8afd38..fcf9de5e7e31 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -7,9 +7,11 @@ DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e
 DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
 DIST libsoup-2.66.2.tar.xz 1446024 BLAKE2B 2953b91e3bf28b80189a87ecff3a9d103d57bb090f62121dc441e9bfa65750b67f2ab4f50e7a7a0cf5691b79139ae84de5aeaff69e7505b5c2fdd3f375536724 SHA512 1df443470239f23d22301e37e36f3d34963352ee0122f317cd15b19d90115831091bddcee27bc6f0d4994adcf4e5bd9c0395de2bd7f39ae305ba0edea7789092
 DIST libsoup-2.66.3.tar.xz 1448924 BLAKE2B 82edc5afe06d41dcd18989fb5cb439047f52c52bd13406fddaa3cafc5540d4c54924c244bb9d58839eb0cf7187da8da82158ddb01f16a7913f543f95df4f285d SHA512 166559480ab84c9bd5407abbed51f4ed76b5c061e647441bf2657ed2c918402985a0a3b9caaf14639f11a40e0b9130bf270a94b32fb72ade3782fac8692bc2ef
-EBUILD libsoup-2.58.2.ebuild 3011 BLAKE2B 6bb09cc7a247550ac1ef0fbc82b3a6e2d0fe421174243f12feabb87dda992b305ef0aaec2fdbc99a13eccd1523ed98f46bfe175598907f30d9365034ad6c3fd7 SHA512 98dfcd612e875658b20e590875f0ffc016fed4f4da998d38954a6fbd5f8817c0d95819343d567432b682dadb152299d826f8d65aa36714de091e4aad8c20e8aa
-EBUILD libsoup-2.62.3.ebuild 2922 BLAKE2B 8b7f012a12a0a6d6ec723a5d8fd74ac57bc5c734c2dd4c65fa51ac6db657f4a286a3324509c4490fe97b9e5c8f0834d8116285392bf643349bb398bffb8c406f SHA512 c70d71b679159df7cf00829cd13e68f8723e054ef3bb3ddcd131008ce699317fb5a7e9a0a69cc4381746441555b2f1dd78c78f1528e39cc38315d396054cbcb0
-EBUILD libsoup-2.64.2.ebuild 2749 BLAKE2B 355649f9823662e3de59e959e3123cebb01fb3bf80fd3f4d68d2197cef02f444fd0761d79153af3217a9d5409f81fc00d74649c931d483aedf349cb0966112eb SHA512 bea4a4a5774888038defe6b3c0041d3b14ffdf46e4942b5afb0183c56d95d8b77478cbaebd0f03fa2aae4cbb17bed028e68a839de5bb7fba7f676543c3105629
+DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad
+EBUILD libsoup-2.58.2.ebuild 2989 BLAKE2B 57ce5571b78237b0cf301cadae2fd341b60b761f9fd4d7355af3a0b06c1f5012d61477be371a217c3612f8c59ed0cee40efde362e9ed9b05c26fde1c8381efc1 SHA512 6a03441253bbf0d2b1769d108fcf5a2ba7d79214222e79f95b74417ab378c661f74976e5394f6a2a5b6068e9c263cad81eb04c081b9446828824faf5f3ef7c50
+EBUILD libsoup-2.62.3.ebuild 2900 BLAKE2B 0c898abfca51dce0a78b6fdd882bf4cd7a60aae0518613c3c30f81ecdd1a4b40a43cd2625fa3171ca2447180786d8685b6032271ac45bace2e373663fb906d89 SHA512 cd447855a0cc044853c07f9ef45f4886113349b5192b50cc0efdba7428c1dfcbfbbe6f5f2a31bc7b0ec83beac5f87003176adebf8068df0d13456afe88d20c73
+EBUILD libsoup-2.64.2.ebuild 2748 BLAKE2B ed2f5330b2cb693564086bc2f2a4a4aa9eded3f21f0598a49962317cbba6aceb2c8d2b6963ce1c78c101904f1628714535023f27d0aa4c9acc86be45c30e9f41 SHA512 73fd3defdcdaf27179efd312e6928c416675778f56836b7160f3e3c9498fff3ce2dcc722fa490f28705b00b47dd8b7122e2b0cc239a3c32a3b18af8075cada06
 EBUILD libsoup-2.66.2.ebuild 2751 BLAKE2B 19a21abb9fd70ca5c5f21d9756fc711114aba0f8028364603574e8550a2a2a100890d9df5d459e57cb769bca805b92ac8f77b606e2444f17e9f5e4870b7fb283 SHA512 f49379ff1e40ec9b62861141c6157576d8d0dc4f9e40c16199bcedb8267d6e3012e6b73e3a4b2850e79116642b81251199f5253440f33ae27cb8c1215b088032
-EBUILD libsoup-2.66.3.ebuild 2757 BLAKE2B 5dce41b873d5463e4035ea430e180cc335c22118517b032939f507fe1132f2905e861f0062175edcabba26541cee8e1b5adf83074da08f7e703863aabeadf433 SHA512 717d9b5f770f5441b779c2cf57b4821f40fba74ccece1baf34e1b92b0c99f9c67f66201f6ed1199b267b0bb7662e24a9fbbc843f4de19b0ed6febab1300a0294
+EBUILD libsoup-2.66.3.ebuild 2757 BLAKE2B 5d90e8787beaba8af83baad61d0cad6234e2a3400554bf30f91c110fe1a84b1dc8cbf4cffa5f261e2e5de2d370ba968d44b1fa40bfe2858139e50119719d35b7 SHA512 084658201916ff1a7b7c74ba9b820e33c58b5e4455935e8918ed2d02c76d7847c7c1508f8bb504e51bf212d9cb72d1528dafab34af8a59481913ecc09838cd43
+EBUILD libsoup-2.66.4.ebuild 2757 BLAKE2B 5d90e8787beaba8af83baad61d0cad6234e2a3400554bf30f91c110fe1a84b1dc8cbf4cffa5f261e2e5de2d370ba968d44b1fa40bfe2858139e50119719d35b7 SHA512 084658201916ff1a7b7c74ba9b820e33c58b5e4455935e8918ed2d02c76d7847c7c1508f8bb504e51bf212d9cb72d1528dafab34af8a59481913ecc09838cd43
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index fa7ceaf700cd..9ba2ab06bf47 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
index 6e215a497f5d..c9496ad3a969 100644
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.62.3.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.64.2.ebuild b/net-libs/libsoup/libsoup-2.64.2.ebuild
index ac7143187f6a..1c3c04ae2467 100644
--- a/net-libs/libsoup/libsoup-2.64.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.64.2.ebuild
@@ -16,7 +16,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.66.3.ebuild b/net-libs/libsoup/libsoup-2.66.3.ebuild
index 1853dc717df2..af731bff6fc5 100644
--- a/net-libs/libsoup/libsoup-2.66.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.66.3.ebuild
@@ -76,7 +76,7 @@ multilib_src_configure() {
 		-Dgnome=false
 		-Dintrospection=$(multilib_native_usex introspection true false)
 		-Dvapi=$(multilib_native_usex vala true false)
-		-Dgtk-doc=$(multilib_native_usex gtk-doc true false)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
 		$(meson_use test tests)
 	)
 	meson_src_configure
diff --git a/net-libs/libsoup/libsoup-2.66.4.ebuild b/net-libs/libsoup/libsoup-2.66.4.ebuild
new file mode 100644
index 000000000000..af731bff6fc5
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.66.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson multilib-minimal vala xdg
+
+DESCRIPTION="HTTP client/server library for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.4"
+
+IUSE="gssapi gtk-doc +introspection samba ssl test +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	samba? ( net-fs/samba )
+"
+RDEPEND="${DEPEND}
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+"
+#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+PATCHES=(
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	"${FILESDIR}"/disable-apache-tests.patch
+	# Fix libsoup-2.4.vapi to be compatible with vala:0.46 and onwards. Included in 2.67.2
+	"${FILESDIR}"/2.66.2-vala-0.46-compat.patch
+	"${FILESDIR}"/2.66.2-meson-ntlm_auth-fix.patch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	# But necessary while apache tests are disabled
+	#addpredict /usr/share/snmp/mibs/.index
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use gssapi)
+		-Dkrb5_config="${CHOST}-krb5-config"
+		$(meson_use samba ntlm)
+		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
+		-Dtls_check=false # disables check, we still rdep on glib-networking
+		-Dgnome=false
+		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}