gentoo resync : 28.04.2019

12 files changed, 115 insertions, 31 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 5d455a6d5ba0..0c404675cf03 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/gss-proxy/Manifest b/net-nds/gss-proxy/Manifest
deleted file mode 100644
index 548101d210c8..000000000000
--- a/net-nds/gss-proxy/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gssproxy 279 BLAKE2B 8413b5e581d084933a1851d3c8be363c07a750180ce72629297466d7afcfdf2dfd94c877883f4503314b5b25b608634f3258c3c1369948b6263dcd9c60b0aabc SHA512 c36d646ee1b7c2e172192782c8d54e51ffb13d75c7afbcd7c67872cfa2baf994a2582bb2b423b27e591051ca2e5b3969dc1f26e7f7a277999537d85e624bcab4
-DIST gssproxy-0.7.0.tar.gz 552041 BLAKE2B 78ec58e151c801ea65e01bf12ac38591442073eef051302afbbd8c11e20c753ae481542a9cdaeb321551ac1ba14be5875b5dc0f9514a0d436bc28e71a5d28c9e SHA512 00cd1d05e12f93f81c11062ccf4950e521960f752a6121f2055e47294a51894eda2415c558d3bc0d4c496146ab8f82a1162328acfb5eb3405c7b116774fa9f89
-DIST gssproxy-0.8.0.tar.gz 557386 BLAKE2B 14948bbd4c08834375ed00d9f9c6624797eadef3a4313af55a3f3cc9fa3133627ed11da97c1414caa1731ef6da1286dbc1e1c41af8e6c4f96dd42e5b0b2b69e6 SHA512 f3b8f053d6750d7ee6ab2bfb6bfc4dc1ac2e2f354f923590340bb3c522f57cc881df5a2850750bc00c0dcacf2ae173549dc3bb9ece4512cf2f39869527afc2ec
-EBUILD gss-proxy-0.7.0-r1.ebuild 2821 BLAKE2B e55cc723a29601e00d383aa07f5ce972ffe86cec64647ad6f85a1eca67eb81b0fa67dae18fef606651ae0eaa4fc1a132da15223d6aeb6d99cb23d646ff65ff14 SHA512 760b7bc7d2126272424e0faedd50ff64413d090046dc1121ec0dbcfc7123497450be78aff1c4b3dc4b55783113e4e7be22a22db0c9c00511fd7dddf63140054d
-EBUILD gss-proxy-0.8.0.ebuild 2826 BLAKE2B 364c92afba2306386e5d845dcadb27379a01296250ca456a470002711edd8883f68339430ef369fdb591b8140b4c85f5bfcdb0858c78c6721fd2fb42f5d11a38 SHA512 a79f7c2483a9a93fe12977cf3ccdfa188fbd22c2f5643adc59b88c2ab991bf04e2868458b58416e3038e64f7b127a4478a3281a8b25141b0549b3e4644f7fe56
-MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/net-nds/gssproxy/Manifest b/net-nds/gssproxy/Manifest
new file mode 100644
index 000000000000..7debc152f5ea
--- /dev/null
+++ b/net-nds/gssproxy/Manifest
@@ -0,0 +1,8 @@
+AUX gssproxy 279 BLAKE2B 8413b5e581d084933a1851d3c8be363c07a750180ce72629297466d7afcfdf2dfd94c877883f4503314b5b25b608634f3258c3c1369948b6263dcd9c60b0aabc SHA512 c36d646ee1b7c2e172192782c8d54e51ffb13d75c7afbcd7c67872cfa2baf994a2582bb2b423b27e591051ca2e5b3969dc1f26e7f7a277999537d85e624bcab4
+DIST gssproxy-0.7.0.tar.gz 552041 BLAKE2B 78ec58e151c801ea65e01bf12ac38591442073eef051302afbbd8c11e20c753ae481542a9cdaeb321551ac1ba14be5875b5dc0f9514a0d436bc28e71a5d28c9e SHA512 00cd1d05e12f93f81c11062ccf4950e521960f752a6121f2055e47294a51894eda2415c558d3bc0d4c496146ab8f82a1162328acfb5eb3405c7b116774fa9f89
+DIST gssproxy-0.8.0.tar.gz 557386 BLAKE2B 14948bbd4c08834375ed00d9f9c6624797eadef3a4313af55a3f3cc9fa3133627ed11da97c1414caa1731ef6da1286dbc1e1c41af8e6c4f96dd42e5b0b2b69e6 SHA512 f3b8f053d6750d7ee6ab2bfb6bfc4dc1ac2e2f354f923590340bb3c522f57cc881df5a2850750bc00c0dcacf2ae173549dc3bb9ece4512cf2f39869527afc2ec
+DIST gssproxy-0.8.2.tar.gz 563300 BLAKE2B 104637af6f43d118ef5194ee8bdfd0a8a8155df43691ac80394de0482f718f2672996b698a80d5c4db7bdc1b164be7f8dc6ffd9a5346affd5923b78362f10333 SHA512 68ce39b36ee83d77da19e9a9fb322ba901366999828a2b427bc2275c4187b4d2291de140c202cce02bdf53eb5cf64da2fafa022ea482258c102f28b0af5d7c63
+EBUILD gssproxy-0.7.0-r1.ebuild 2772 BLAKE2B f91994050439b41fe8fd6e31e234f9f5d60c3202ccf59664958b37a199cd3f3d786c2cab3c56003e81a72b25b702353136c88f33ab1c3516d252a018d32cf9c4 SHA512 b9017d2455856a88a93b05cc53b78c8db4b9683ff4158ac7bdf462cf2db384848157d58a35e02ca364dcbac216978fa6cf41646425b8187ae035f737472279f8
+EBUILD gssproxy-0.8.0.ebuild 2777 BLAKE2B ff1edd382a3a7d5e6f8a7dcb5ec414b144fb8f963a98d24bc467e53e22e7757857c9d15d35d91320a6495a8343341ab088cf91fd91b593380f6c1ecf6cbc9857 SHA512 9c013f50d746dda87496ac865c5061d74f9ad9feeb55fb59019348b88b89be70930d0c6fae04dac8b4bf9442b4319986f506d14a0da5dff87b0d4aa459c0bf3a
+EBUILD gssproxy-0.8.2.ebuild 2792 BLAKE2B 792767b8cef51ec3aa17a76c9f41d63a250b4e56aea58bb4a1351a1dc0c8b22a7939d8c8a1fb8241b28fabc7ff9bcf8edadc09ec4ff548cd0b21ad1ef9a99cc3 SHA512 93d4044afcf0fb9ff94f36085bfac005f353a63fc1f52f9472a4350d5c08a49f61dd38f8b0029b425c6de82366aaec38ceab043bf63fca237f5874bc7996c1b2
+MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/net-nds/gss-proxy/files/gssproxy b/net-nds/gssproxy/files/gssproxy
index 8c29f899f2ca..8c29f899f2ca 100755
--- a/net-nds/gss-proxy/files/gssproxy
+++ b/net-nds/gssproxy/files/gssproxy
diff --git a/net-nds/gss-proxy/gss-proxy-0.7.0-r1.ebuild b/net-nds/gssproxy/gssproxy-0.7.0-r1.ebuild
index 70b3508e2eec..be1691b9b6ac 100644
--- a/net-nds/gss-proxy/gss-proxy-0.7.0-r1.ebuild
+++ b/net-nds/gssproxy/gssproxy-0.7.0-r1.ebuild
@@ -3,11 +3,9 @@
 
 EAPI=6
 
-MY_P="${PN/-}-${PV}"
-
 DESCRIPTION="daemon to proxy GSSAPI context establishment and channel handling"
 HOMEPAGE="https://pagure.io/gssproxy"
-SRC_URI="http://releases.pagure.org/gssproxy/${MY_P}.tar.gz"
+SRC_URI="http://releases.pagure.org/gssproxy/${P}.tar.gz"
 
 LICENSE="BSD-1"
 SLOT="0"
@@ -27,8 +25,6 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
 # Many requirements to run tests, including running slapd as root, hence
 # unfeasible.
 RESTRICT="test"
diff --git a/net-nds/gss-proxy/gss-proxy-0.8.0.ebuild b/net-nds/gssproxy/gssproxy-0.8.0.ebuild
index 7939c3e2191f..f71a78f3963d 100644
--- a/net-nds/gss-proxy/gss-proxy-0.8.0.ebuild
+++ b/net-nds/gssproxy/gssproxy-0.8.0.ebuild
@@ -3,11 +3,9 @@
 
 EAPI=6
 
-MY_P="${PN/-}-${PV}"
-
 DESCRIPTION="daemon to proxy GSSAPI context establishment and channel handling"
 HOMEPAGE="https://pagure.io/gssproxy"
-SRC_URI="http://releases.pagure.org/gssproxy/${MY_P}.tar.gz"
+SRC_URI="http://releases.pagure.org/gssproxy/${P}.tar.gz"
 
 LICENSE="BSD-1"
 SLOT="0"
@@ -27,8 +25,6 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
 # Many requirements to run tests, including running slapd as root, hence
 # unfeasible.
 RESTRICT="test"
diff --git a/net-nds/gssproxy/gssproxy-0.8.2.ebuild b/net-nds/gssproxy/gssproxy-0.8.2.ebuild
new file mode 100644
index 000000000000..49c35990a280
--- /dev/null
+++ b/net-nds/gssproxy/gssproxy-0.8.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="daemon to proxy GSSAPI context establishment and channel handling"
+HOMEPAGE="https://pagure.io/gssproxy"
+SRC_URI="http://releases.pagure.org/gssproxy/${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug selinux systemd hardened"
+
+COMMON_DEPEND=">=dev-libs/libverto-0.2.2
+	>=dev-libs/ding-libs-0.6.1
+	virtual/krb5
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-gssproxy )"
+# We need xml stuff to build the man pages, and people really want/need
+# the man pages for this package :). #585200
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.4
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+# Many requirements to run tests, including running slapd as root, hence
+# unfeasible.
+RESTRICT="test"
+
+# pkg_setup() {
+# 	# Here instead of flag-logic in DEPEND, since virtual/krb5 does not
+# 	# allow to specify the openldap use flag, which heimdal doesn't
+# 	# support.
+# 	# Using mit-krb5 explicitly because heimdal doesn't install kerberos
+# 	# schemata required for the tests of gss-proxy.
+# 	if use test && ! has_version "app-crypt/mit-krb5[openldap]"; then
+# 		eerror "Tests of this package require the kerberos schemata installed from app-crypt/mit-krb5[openldap]."
+# 		die "Tests enabled but no app-crypt/mit-krb5[openldap] being installed."
+# 	fi
+# }
+
+# Was required in 0.7.0 to fix the schema- and slapd-path. Reason for
+# comment: see RESTRICT comment
+# src_prepare() {
+# 	default
+# 	# The tests look for kerberos schemata in the documentation
+# 	# directory of krb5, however these are installed in /etc/openldap
+# 	# and only if the openldap useflag is supplied
+# 	sed -i \
+# 		-e 's#/usr/share/doc/krb5-server-ldap*#/etc/openldap/schema#' \
+# 		-e "s#\(subprocess.Popen..\"\)slapd#\1/usr/$(get_libdir)/openldap/slapd#" \
+# 		"${S}/tests/testlib.py" || die
+# }
+
+src_configure() {
+	local myeconfargs=(
+		# The build assumes localstatedir is /var and takes care of
+		# using all the right subdirs itself.
+		"--localstatedir=${EPREFIX}/var"
+		"--with-os=gentoo"
+		"--with-initscript=$(usex systemd systemd none)"
+		"$(use_with selinux)"
+		"$(use_with debug gssidebug)"
+		"$(use_with hardened hardening)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# This is a plugin module, so no need for la file.
+	find "${ED%/}"/usr -name proxymech.la -delete
+
+	doinitd "${FILESDIR}"/gssproxy
+	insinto /etc/gssproxy
+	doins examples/*.conf
+	insinto /etc/gss/mech.d
+	newins examples/mech gssproxy.conf
+
+	keepdir /var/lib/gssproxy
+
+	# The build installs a bunch of empty dirs, so prune them.
+	find "${ED}" -depth -type d -empty -delete || die
+}
diff --git a/net-nds/gss-proxy/metadata.xml b/net-nds/gssproxy/metadata.xml
index aebca33be179..aebca33be179 100644
--- a/net-nds/gss-proxy/metadata.xml
+++ b/net-nds/gssproxy/metadata.xml
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 5bee2173e09a..4b2ddd3d62af 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -25,7 +25,7 @@ AUX slapd.tmpfilesd 90 BLAKE2B f9cdde975b45c61c18773e4a3b30e3cb3c2a7d979bfef6d05
 DIST openldap-2.4.45.tgz 5672845 BLAKE2B e1f97553482a2e8630b62bc0f439af2484f1a2349a1a077382a124354424fe510ab55f32c073565b142d0c9318870fe31a2652268ebabd97d3afd8c833bc7aab SHA512 1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab
 DIST openldap-2.4.47.tgz 5699678 BLAKE2B e172b3f0bb3c1dfdaa734fd76581758a5d51bb9abb9c038f9ae5dfa6de45ae0eaaecab443aa113b08f8c26b44b1b1ed684a85882732bffa42548029f80f4c1be SHA512 d424079e34207e3d24383a2bea70a07ded40714982a6767174d2b2cb208cd94feab5ef12157accae915b8e404e5773a7547aaef65f06b44dc3cc09c6a64d5a11
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
-EBUILD openldap-2.4.45-r1.ebuild 27978 BLAKE2B ea0875da650956da099abea7ac9087b31519a2e25632cb91548794bcc189cd4f82ee073c00ed18f60692c7f328556d18a791c25e0d6e5760949e0d79bc740888 SHA512 226be898ac52e28c06aa24fed972a1527260337e2fa25089658729846b79d5256d700d16bf8088c9ab7de7c1ceae177e425f76e77c3a36605e782c9653ce778e
-EBUILD openldap-2.4.45.ebuild 27958 BLAKE2B 41e3b6e20ad966c68f2422a077fb0c351eb3cee52e1b0c584027328416ce0fc9e1eee507297d0445b4af12550ef10bfa349fcf376102b15759c6dc41e71588fb SHA512 784bff08fb252983095839ade87a247ed978b93ee13cf345a429993ed905f59c720509920ad265f44ef65187ad7643ba7418fcf7ceb0a6d02f43ff661244e3d5
-EBUILD openldap-2.4.47-r1.ebuild 28977 BLAKE2B c6a19a4dfeb2449b76a05c339dab83a8376aad14d85762598f00065f05d1e7b253580cbcd93957baabf61a6e4d695ae99dfa56e44f52fd5b8202da7350c4ce73 SHA512 98c942599fb6a558fcc1dfbceeab156be58cd05d69ec68a37fc1b919936211a82da323fef7f446b736df185fe1baa1eb499a5d4f1d5594ba0c0e5ccc7203fecf
+EBUILD openldap-2.4.45-r1.ebuild 27965 BLAKE2B c33bc19e6bcd3cbaa39cc59b44bff96606495a34f15c67b2a0742c54dfed1a68a735fdff749ebb53b37f062aacad4ec57203fae53bbb6fb4ef451cadba619943 SHA512 dc1704b4c2c01e85c7cdce5242b0b7c81738b8220bbe0f6564542912a90cd290b938451dabac6651012ee6ec6cf3a093f09bfb028d98a18e6a5f4493001fb966
+EBUILD openldap-2.4.45.ebuild 27948 BLAKE2B 9adf4df42b2ae571fffa70ad15cbc685614657adb53dd2b8e0c3750597166968269df7fe7727c8a514333eb250749aef9e592fdd2c8ef6272240760ea7f6671f SHA512 32433e8cb7b67b1f4defa18718f32100234af7d144aaf978dddd3eec0b3f24ffd4ccc4334d9f9bb5a35c88571ac146bcc5933b04c4c4cfc2f0dd4d83294c33c5
+EBUILD openldap-2.4.47-r1.ebuild 28956 BLAKE2B c7c808777ee8669365265291facfde8e76468aa9dd4b802eaa26b260f41a7c9dfd6c21cc645598e1d23a8e600731970e333a792b61732a10fa7d36bdbbd5e47b SHA512 b76b7719ed4d3172c5532b7e1c6e0b5e22989d2b9fb1d1a39b82ac48f477ee86161d9f6d935d1e9e74dcd4dd712567c7905d2c1445e96367970593b4e9f66e11
 MISC metadata.xml 922 BLAKE2B f99c4b3703f1a22dccbc0bbb109d11ba747c61229ebc811b036784dee829c4f7ce4bd85d4f5b8d7780cf20194d5175511129b9256416eea7daf4094e20d8c1a7 SHA512 fc9eb245cde878a93e08b8213f58b829266b2171ee73a74a39b47e700e506225da36e7d51952586f3d97ad6e0a3b3792fa59b5620bad0749afc87b8d59678ff9
diff --git a/net-nds/openldap/openldap-2.4.45-r1.ebuild b/net-nds/openldap/openldap-2.4.45-r1.ebuild
index 7d16acea025a..027f4e6a258c 100644
--- a/net-nds/openldap/openldap-2.4.45-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.45-r1.ebuild
@@ -29,7 +29,6 @@ IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
 REQUIRED_USE="cxx? ( sasl )
-	?? ( gnutls libressl )
 	pbkdf2? ( ssl )"
 
 # always list newer first
@@ -45,10 +44,13 @@ CDEPEND="
 	ssl? (
 		!gnutls? (
 			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
 		)
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) )
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+		)
+	)
 	sasl? ( dev-libs/cyrus-sasl:= )
 	!minimal? (
 		sys-devel/libtool
diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild
index 7f5cd3fc1bd9..afafb6f7063a 100644
--- a/net-nds/openldap/openldap-2.4.45.ebuild
+++ b/net-nds/openldap/openldap-2.4.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -29,7 +29,6 @@ IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
 REQUIRED_USE="cxx? ( sasl )
-	?? ( gnutls libressl )
 	pbkdf2? ( ssl )"
 
 # always list newer first
@@ -45,10 +44,13 @@ CDEPEND="
 	ssl? (
 		!gnutls? (
 			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
 		)
-		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) )
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+		)
+	)
 	sasl? ( dev-libs/cyrus-sasl:= )
 	!minimal? (
 		sys-devel/libtool
diff --git a/net-nds/openldap/openldap-2.4.47-r1.ebuild b/net-nds/openldap/openldap-2.4.47-r1.ebuild
index e63077460b18..5b6b5239e468 100644
--- a/net-nds/openldap/openldap-2.4.47-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.47-r1.ebuild
@@ -29,7 +29,6 @@ IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
 REQUIRED_USE="cxx? ( sasl )
-	?? ( gnutls libressl )
 	pbkdf2? ( ssl )
 	test? ( berkdb )
 	?? ( test minimal )"
@@ -50,8 +49,8 @@ CDEPEND="
 			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
 		)
 		gnutls? (
-			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
-			>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
 		)
 	)
 	sasl? ( dev-libs/cyrus-sasl:= )