gentoo resync : 22.04.2018

4 files changed, 7 insertions, 19 deletions

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index c780e65dcffd..b874fe815d33 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,7 +1,7 @@
 DIST gnutls-3.5.15.tar.xz 7238928 BLAKE2B d9a081ec0f956cabe0e0a240c6f20bd2f2855ca8b692b22322f4c80b521cfc8a9bf45da32518225550f289bb0db7010f40a3b371a9e79e394c6ec88004a15fab SHA512 046cf3adf6cc3d38fd431f2ff28ddabb65f3c13379516d105316a04c7128be89c5f7ed3df6a034fc06e9ab2e154c2cde2f5cbe8530a1e58cc4b4fb72e158134b
 DIST gnutls-3.5.18.tar.xz 7261980 BLAKE2B 1c7df33aa331634885426196d1e39cf7c5748ba467323d7a48c4e865efcea03e3a59a7bb21cebb4cfe9d11a83a532bb785ae9a5824703c759e573de0f347004d SHA512 434cf33a4221fe2edce1b531cb53690d14a0991cb2056006021f625fb018987351f8ec917c3a7803e5e64179cf1647a3002ae783736ffca3188d2d294b76df52
 DIST gnutls-3.6.2.tar.xz 8093304 BLAKE2B a5e40cadb184eb960e51cc0d94d441e50378f33582eeda1382e9ee3a9a4b2d26f6b44948921d8983de3e1b8fbc0199e0d894ce8b8da1fddeb84dbe304b2f9222 SHA512 6a574d355226bdff6198ab3f70633ff2a3cff4b5d06793bdaf19d007063bd4dd515d1bd3f331a9eb1a9ad01f83007801cfa55e5fd16c1cd3461ac33d1813fb06
-EBUILD gnutls-3.5.15.ebuild 4236 BLAKE2B 80918bc1f10b26536115060993a944da85f2722fc712096d52b8b3cc3a8475c2eb03c33d758dddbf3153c0bf39490617d5486d4201f007f52802f7d45b3b1baf SHA512 f730783f61a95a88bfccce7ed4d8e8c8252422ac10607e9c9b2d5ce2256e55b7992b1d4e1404597707aaea248a2bff86d6e70a725dbfbf4c9436e6a83f890859
-EBUILD gnutls-3.5.18.ebuild 4249 BLAKE2B a96ce6697af48f8328fa68585e71f30025fb55f18c684053eb1d6d488e6e81a972af779856d7e2e9ce4ea0ffd43a5b5620144b8dae74781b7c3ab66486b75c42 SHA512 2f2f669bcb86912d7674a88d08ee7370d279dd3c0ebe75120b826c157d0b1ed26ce4db09088cf382a4350caa3adacff96fbab2f2856c480209b9ccfbceb15463
-EBUILD gnutls-3.6.2.ebuild 3878 BLAKE2B 0cebd0411d0d453de815977333a51635b63a53e4fa64a27fc8b570285a48555f19a2f0be451dc228e82d02af9c812a57716a07105767104b59f4838a0f5e3f3a SHA512 ea857f52bce797a16893eea5bc18ac2a79d12203abf0e477307f2e6676b1c8d54b9e1f8540640d617ae605fd7cf8e9a4915d51985cd8296c84b7e67843ed7bce
+EBUILD gnutls-3.5.15.ebuild 4109 BLAKE2B 04b4e2f396c7a9648c5515822e4899228adba373a3b51cf8e17174418c6de99384a40e2e1f255541f5bb0a0ab1c96d4556c52438ef7cb3ac7038adedec43a094 SHA512 e1f4936c0222c38a0f280bfbb86e8cdb2e4e9e4f22baddd5a8ab9c163fc0afd6f9ddb7924a42a398650bf77f7ae8d230b9e8d2713a01e53986b02d7545725547
+EBUILD gnutls-3.5.18.ebuild 4119 BLAKE2B 52837e718812f503b929fff6062e5457f6e8e71b0ff590bae88e52a99b0f78680d5f9f9345de8dd09651a750e033e13eb7f0f3eaabe6a1214060427179aa9152 SHA512 9e0b99dd1d30d4eda62306cad30e5873c912ceec58862d269d7d8c59b3eaacec1b195459396ab65d2eaa1885cb0ff7f6c723205de7a9b28735ff70a39b9994b0
+EBUILD gnutls-3.6.2.ebuild 3751 BLAKE2B 9777ce3562714525ea3442a8ede4a654e4fa80d67418a9eae8ddde910c934593b3f6c5ff33042cdefbb2d403ba4e403cd51998e2167a5b38c7ba4e367bdeea60 SHA512 d64c7e65868e2aac58ed783a415a8756c1b225bda0a4082798d52c8eb332ddd03ba5f07a9fa34c7831d975a17e0def85faa0b6f5ba9046b3ac49472d5756f96a
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.5.15.ebuild b/net-libs/gnutls/gnutls-3.5.15.ebuild
index 7e0a5dd1b45d..55582fba7fa1 100644
--- a/net-libs/gnutls/gnutls-3.5.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.15.ebuild
@@ -29,11 +29,7 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
 	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
 	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	doc? ( dev-util/gtk-doc )
diff --git a/net-libs/gnutls/gnutls-3.5.18.ebuild b/net-libs/gnutls/gnutls-3.5.18.ebuild
index 5f47775ad57d..153bbdaa0385 100644
--- a/net-libs/gnutls/gnutls-3.5.18.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
 
 REQUIRED_USE="
@@ -29,11 +29,7 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
 	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
 	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	doc? ( dev-util/gtk-doc )
diff --git a/net-libs/gnutls/gnutls-3.6.2.ebuild b/net-libs/gnutls/gnutls-3.6.2.ebuild
index 1c8e4281985b..cc2a7e26e1e8 100644
--- a/net-libs/gnutls/gnutls-3.6.2.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.2.ebuild
@@ -28,11 +28,7 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
 	guile? ( >=dev-scheme/guile-1.8:=[networking] )
 	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
 	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	doc? ( dev-util/gtk-doc )