gentoo resync : 18.11.2019

9 files changed, 75 insertions, 20 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 25db69f54d06..ebd264a09f0d 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 1ba4cc8e3508..9874010c63d2 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -3,6 +3,6 @@ AUX autoipd.sh 1271 BLAKE2B 815c5776afff71489826eb8338535df1af6fbf02f3d42eedb6eb
 AUX avahi-0.7-CVE-2017-6519.patch 1578 BLAKE2B 87fce922927e1217802ce0f7b2a1a6f22649903a495817e224a37e7fc5c76d0d2a6cfbb50a1373a950a75a45a68bfbcba9f2155ed24940e3ffb994b862c00e4c SHA512 6c30c0d095f42b9bd289a1ac7b42287cd109bf0bad480d13eec70bedb65e7e1ab495600703f39f1caf73c3c0617c72940c33462586d68deb0a416d7c93964997
 AUX avahi-0.7-qt5.patch 6033 BLAKE2B 10c7879f6e28942a32497c84dcf523f742cb13112d9e9c23f74967c2d6c05e6f463406716c144edc1bd4588c8c76693473765d9d678f6517c4a57615d0364b91 SHA512 cd8b900a5a068add3b7aa9080491938d469795c26e1a1869ee581b95d877ded4d120cb4db768fb4d97535a72e66c3fabf6617cdca2c9bdb50ff54e24d17b1f51
 DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc86825cae303f94c44482eea07cf6570d970ca286e81a787d6a64598b7123f2ac17a259ddc50ef431b9c94b530 SHA512 61f656da7614d8cca1862180038f571db3474c84f05db4d3509f614cdbf8b1a1047661b7e24d63682d5b48ed1bfa1b08b3c9e6dbe9222bcd62d99bc168a11abe
-EBUILD avahi-0.7-r2.ebuild 5232 BLAKE2B b1d036c72b38470a1fd9c5a20de2331873580cabb37248edaca9198612168279ee4de7f58e7a5cf1e8938e3e248440ec0fbb4974c7d0aa7cb87b1b38b8656f5a SHA512 de200179af1dcc62296982620e8e4c8bebb220f68c10d57feb9aca3243bc44f5a67d6fe041d036b616f8e0f84b6a54228e24297e6242d8f585946a76f968ab9b
-EBUILD avahi-0.7-r3.ebuild 5267 BLAKE2B 556ac806f4e8e9550eb6b0a3a2f54a515f22bec4f0a7be0fc0f753892c4b45911bdffaff19a1a475de259944b3ea6896c22fc9ffb2693e6316633d67b64593c0 SHA512 4d1b7cab60dca6b69dae4918c20dcaabb6c429fde560b762f1ef2f22b1364446f58a1383f1aef9ca4e7137d0840ea27f8cf1d492bbd1053f407c7c631ef30488
+EBUILD avahi-0.7-r2.ebuild 5259 BLAKE2B 40ca772ce3bb4004cc86545e81288afecd9324ecd1cdb11c188d8b1f0572a118b275b01c123beb2bc7247ced4f1baf197969b9e33a6e0bbbc14f5c66e8d89277 SHA512 dd64616525130c59d7ebe2c433113542d9ec57d591cc72661b3580371e1da668776038e3c509934be12aeb8647f5550b7dff433726eb4d00324eb453f24f14f0
+EBUILD avahi-0.7-r3.ebuild 5289 BLAKE2B f14eb1796409fab5637b5b23541ce2b9a3f9b791461052b268840e8d34d0092a391dc418fd540b3fc9411c53bb80d6bf73ed6b70201a27e5bdb4a7ca6fa541ef SHA512 214bea56bd34853bbca44512e84cbf8b2b8938690285b44974912de31f0594bfdb5cd4bee18de53df551e4d0fea068028a748b523917738316a1eb12ebe05169
 MISC metadata.xml 935 BLAKE2B 890b4a3ab97241ba254dcf68b97a6a8b2ae4af914dc2348b8eb9d6c3182c1d2dfbd5eca8dac009e30f4662b88001c159ac5479a100bfc48a956ac2d603b6343e SHA512 7d2114e25574532405b5ff6db66b833aef68772d5b699d8885e9f1005a1785298e5b71288a858572a1270c6a4d9d2ad98aac7f79f4df6713dea79778280c82d8
diff --git a/net-dns/avahi/avahi-0.7-r2.ebuild b/net-dns/avahi/avahi-0.7-r2.ebuild
index 1161dd0f6055..a1d608250889 100644
--- a/net-dns/avahi/avahi-0.7-r2.ebuild
+++ b/net-dns/avahi/avahi-0.7-r2.ebuild
@@ -16,6 +16,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
diff --git a/net-dns/avahi/avahi-0.7-r3.ebuild b/net-dns/avahi/avahi-0.7-r3.ebuild
index b92db92a4742..9295cc5587fe 100644
--- a/net-dns/avahi/avahi-0.7-r3.ebuild
+++ b/net-dns/avahi/avahi-0.7-r3.ebuild
@@ -16,6 +16,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux systemd test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
@@ -25,7 +26,7 @@ REQUIRED_USE="
 	systemd? ( dbus )
 "
 
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/libdaemon
 	dev-libs/expat
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
@@ -50,9 +51,12 @@ COMMON_DEPEND="
 		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 	)
 "
-
-DEPEND="
-	${COMMON_DEPEND}
+RDEPEND="${DEPEND}
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+	selinux? ( sec-policy/selinux-avahi )
+"
+BDEPEND="
 	dev-util/glib-utils
 	doc? ( app-doc/doxygen )
 	app-doc/xmltoman
@@ -60,13 +64,6 @@ DEPEND="
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
 
-RDEPEND="
-	${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	selinux? ( sec-policy/selinux-avahi )
-"
-
 MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h )
 
 PATCHES=(
@@ -194,7 +191,7 @@ multilib_src_install() {
 	fi
 
 	# The build system creates an empty "/run" directory, so we clean it up here
-	rmdir "${ED}"/run
+	rmdir "${ED}"/run || die
 }
 
 multilib_src_install_all() {
@@ -208,7 +205,7 @@ multilib_src_install_all() {
 
 	dodoc docs/{AUTHORS,NEWS,README,TODO}
 
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -type f -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 42ab1020554c..1b58479d9d3c 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -4,5 +4,5 @@ DIST c-ares-1.14.0.tar.gz 1335940 BLAKE2B d62a0b6d5ea4a2926ff8f2f719d267f9a0c97f
 DIST c-ares-1.15.0.tar.gz 1347687 BLAKE2B c4028bb2840af23274b79c73600bfcf73a348c7ab63ae3c215829e0fe2cf149f4ad38a3ec657c3997bad818ced3cacaed0579dd0dd2ef42eaffd074bdc4f22ed SHA512 a1de6c5e7e1a6a13c926aae690e83d5caa51e7313d63da1cf2af6bc757c41d585aad5466bc3ba7b7f7793cb1748fa589f40972b196728851c8b059cfc8c3be50
 EBUILD c-ares-1.13.0.ebuild 969 BLAKE2B 2f23720e95a9be5863ccec52ca054757a30e99241f3e23b699b7eaea3e25fb225b1e541373e3c17086b68a3486f98eb287201e0df4ac6e9eb124270367395818 SHA512 0bb7a95651abbf457d714dad172a81b3175231bfea17d3316b41d3d945d7f3f6e7f2cc181e0b6b742c28f845b295bc7ecc0f6af0bf55d33610b314c92f3844ff
 EBUILD c-ares-1.14.0.ebuild 982 BLAKE2B f44ea3bae649a7e86efe3dd9e27646fa85c769ff8ccfa526e5639b340adc43161fa3e132e24ef36e2a6d8eb38e19835389e18cec67bae3e365aa9ef9827001e6 SHA512 ae1071964f64ba56385d3ab7b0dd5a59c5181ba664615d8ddf55320db2c47322e87c4ae735e845abb271dd8a171cbc742af8fe621d73ab84d2cc0dd077101ca5
-EBUILD c-ares-1.15.0.ebuild 980 BLAKE2B 24e5bcf54f9d2f7361827d5855295ad03c1ce33a9049fe887f98385ed9283095ab5316ad45e8c3f8d9197fc8fe08caa0a2831f6b20d758a8498c096797855b91 SHA512 16e503fdcf72c08e6a803d6d594c2d4f4dd3272e445c6e3e143d9a66f23d121404897874e5d2bea21c9156f5eec77b4cc77a7636324641872afe353b35ce55d5
+EBUILD c-ares-1.15.0.ebuild 976 BLAKE2B 427383ac2aea0af63ae692d3c001ee4844add852050d68e878d22956e70f18a47698da60bf71916ef75bf74b5bb92d830ce6862c387ea9df74ea364adec843e4 SHA512 e2b13904a50cf1e73bcd194d63975817874e9895f810eb594e8e5298b0b5e5b7a47c706f781f6e79c49687a8bf3b563f25ea8fb8095fa0d7d95c4098027d681c
 MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.15.0.ebuild b/net-dns/c-ares/c-ares-1.15.0.ebuild
index f7d53e17b5c6..13f28c89b108 100644
--- a/net-dns/c-ares/c-ares-1.15.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.15.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://c-ares.haxx.se/"
 SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 6dc91527c95e..e2cb0633690c 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,7 +1,9 @@
 DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
 DIST libidn2-2.2.0.tar.gz 2110743 BLAKE2B 08a1f89d4b6edd7da4d91c9d21f9944c1ebb4064cb43147ac23fcd79f0a0bbd94e7d2b9a72382784f4aaca211cf9502a5117dfa63ab5fe72383188eeae6f628b SHA512 ccf56056a378d49a28ff67a2a23cd3d32ce51f86a78f84839b98dad709a1d0d03ac8d7c1496f0e4d3536bca00e3d09d34d76a37317b2ce87e3aa66bdf4e877b8
+DIST libidn2-2.3.0.tar.gz 2164993 BLAKE2B 3c103831c39fa3fd0340c9c45f3f683483207ade9cadc8d85b046a698f75bbe5ce6829de69a5cb238404d243b7a39ef44d69ea4ea80c22b813eafbacae615a8b SHA512 a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
 EBUILD libidn2-2.1.1a-r1.ebuild 1307 BLAKE2B 48f3e52c90b5c0c371151b42f3cc6bfab59a24558e8f89e9070b4f82bf3a72370af1c620d343a3178f4047d6e2dd06b9d0d8efcf42bf067e4bfb07cdb90ee241 SHA512 18ffd225a7e9dbd238f85a93a79099dbc53733569ea2e6d4e8b0d3c37d0534686b0b939a02c4e7f913c40cadc9a7ef274c6de2988982b8381dbbf17d2ed9cfe1
 EBUILD libidn2-2.2.0.ebuild 1320 BLAKE2B a86dcfd0262d88816e207842c2dcc64a4561530ee75284540fc670577c06cc0ec595da073f8b4b8630ab52836f1b9959e5f1cac692bb0534bd06640d810b4c77 SHA512 48b1de72a6bddddd7dee26240c06e40ada7e2064125a38c1cd59f7807e2992f8aeac0f4460e15a22e858bf4788ae8a01fbbcd9ec207057e97172e183f4f4f0a5
-EBUILD libidn2-99999.ebuild 1416 BLAKE2B ea56153f0eb2ca68fcd2fd170e2cfeedc8399a3bf5ba78d8bc78250ebbd59dd05e4074dee3bb4d3caf67b4c3391de331a495423d0f0cdc16c953fd4fa75ea278 SHA512 66f96b4e87d01dbb779d29ab83cfe6c1e756dcbc5db1555ca9128f0faa7888156c45e71befb2daa45c86aa77afeb9bdd6551b6336b955f57fb4179d1b2c6e512
+EBUILD libidn2-2.3.0.ebuild 1320 BLAKE2B a86dcfd0262d88816e207842c2dcc64a4561530ee75284540fc670577c06cc0ec595da073f8b4b8630ab52836f1b9959e5f1cac692bb0534bd06640d810b4c77 SHA512 48b1de72a6bddddd7dee26240c06e40ada7e2064125a38c1cd59f7807e2992f8aeac0f4460e15a22e858bf4788ae8a01fbbcd9ec207057e97172e183f4f4f0a5
+EBUILD libidn2-99999.ebuild 1416 BLAKE2B e7e8c9d1bdd0f95859ea274c51ffc17d18688e9ad891ad98e1de8e98129da0f479dc843cc4c9c9bd1bf4e2dde11b2127f0d56084dd983c10e29b370d2656bc3d SHA512 5da9807a3553225f5f4b0127365dbbb9d758b3ebd36f3db490d8f87d2b8f61e71fc03925c66e52ad714c5c3f265722faf84e8b6acccfbcd3d2b4715029ef54e5
 MISC metadata.xml 298 BLAKE2B 10b6250e87ec67fff437294893f9ac1a0c923b6c2bf69bc0462698632fbed280538f547a920cba9e8a1175534ad35a5a5d8d0d48f6824c378c46d34f91787712 SHA512 fb859efba7ea8f760f3d3f341496feeda5f8af633f40d4785ea738037017eae89060555447ae29abe69c0acc6f911a323aaa94dfc39f34e6aa9996af506372c0
diff --git a/net-dns/libidn2/libidn2-2.3.0.ebuild b/net-dns/libidn2/libidn2-2.3.0.ebuild
new file mode 100644
index 000000000000..423471d58b6e
--- /dev/null
+++ b/net-dns/libidn2/libidn2-2.3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2"
+SRC_URI="
+	mirror://gnu/libidn/${P}.tar.gz
+"
+
+LICENSE="GPL-2+ LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/libunistring[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/help2man
+"
+S=${WORKDIR}/${P/a/}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
+		# reason in the Makefile)
+		sed -i -e '/^TMPDIR = /d' Makefile.in || die
+		export TMPDIR="${T}"
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-doc \
+		--disable-gcc-warnings \
+		--disable-gtk-doc \
+		--disable-silent-rules
+}
+
+multilib_src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/libidn2/libidn2-99999.ebuild b/net-dns/libidn2/libidn2-99999.ebuild
index 408ce3cd2ad1..984e8fbe6c1b 100644
--- a/net-dns/libidn2/libidn2-99999.ebuild
+++ b/net-dns/libidn2/libidn2-99999.ebuild
@@ -33,8 +33,9 @@ src_unpack() {
 src_prepare() {
 	mv "${WORKDIR}"/libunistring-0.9.10 unistring || die
 
-	einfo "./bootstrap"
-	./bootstrap --gnulib-srcdir=gnulib --no-bootstrap-sync --no-git --skip-po || die
+	AUTORECONF=: sh bootstrap \
+		--gnulib-srcdir=gnulib --no-bootstrap-sync --no-git --skip-po \
+	|| die
 
 	default