Removed gcrypt support as it breaks with >=dev-libs/libgcrypt-1.6.0

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

8 files changed, 48 insertions, 49 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index d420328d5ebd..df22b369fee2 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libssh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.92 2013/12/20 14:13:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.93 2013/12/20 14:33:33 polynomial-c Exp $
+
+  20 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> libssh-0.5.5.ebuild,
+  libssh-0.6.0_rc1.ebuild, libssh-0.6.0_rc2.ebuild, libssh-0.6.0_rc3.ebuild,
+  libssh-9999.ebuild, metadata.xml:
+  Removed gcrypt support as it breaks with >=dev-libs/libgcrypt-1.6.0 and
+  upstream intends to replace gcrypt with nettle in libssh-0.7.0.
 
 *libssh-0.6.0_rc3 (20 Dec 2013)
 
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 3346b4fa2aeb..64ab592b3f61 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -7,27 +7,27 @@ DIST libssh-0.5.5.tar.gz 321583 SHA256 c0df0f05fc812dbe26fd4118bec0776aa9e892c07
 DIST libssh-0.6.0_rc1.tar.gz 386384 SHA256 ef28febfb2f0d9140b1009948581eb15ca3868eb6265ea2c8d6cb5f44e7da8a5 SHA512 80ec9d373d959a17c0508d322d7a841863772c02a8cd5d8f7a93e8e1b63f177087d4e1eab94c4d346b790e012dfe37a8edf3783be809ab751979b9eefe97939a WHIRLPOOL cc4ed37a4aac241d5c43dc47bd69b90b41f9071814b261017631b7d2ef8ac0dca532c53d1a89edea07b6609d26f8b0a59429dccbdca66aa579cec9c6b1c2a4bb
 DIST libssh-0.6.0_rc2.tar.gz 392315 SHA256 bd53730278ffb333917b5139221944586dbc9418be36e6764c14da725fb6aeb3 SHA512 809d29c14930048bacedb964937fab6bc8dc2e78edef81fdcd2c851576a9a3bc4daff4cf0ed08dd9e2572fa8fa4460d5161ec221b995b96d97406a3bac8e71b1 WHIRLPOOL 81e8bc9b24d3413df369adeb8e04c63b79ad4d0f41a6fcfaad667395cd588c61c1db06d3d9693f6a36f9e773ccae48c52c4b675da4e0ae0de6797b9b5bb56956
 DIST libssh-0.6.0_rc3.tar.gz 395230 SHA256 1293d9817090d16cd9ecf9e91baa1ca21d1158fbeaa3ab840f7cf44490bb58df SHA512 606d2869963dbfe62fb20a32e14ccb759add3f8f42340521509e2badd650d41c3d47aae6ffd34e7fc3dc67987e60ddc812dedca1121b75db1158ae72668a44d9 WHIRLPOOL c2d8004f30eec08a337a0551879d681677ffad03f2c31e9292ce7bcad2432e7059ab1d9834e941cdce25f73cbb108f60ee8eda13bb6be7275c858b5f32a5c066
-EBUILD libssh-0.5.5.ebuild 2026 SHA256 6fcf343b8ccdb20ed991b2be0a13c53cfb9be217ff2cef156f3b64738c5718f8 SHA512 ac1c2b1ba08f5b9d46c5afc2fe8fc06267d0c34412f9977ad12b83e5ce213bbf280e0777f325afdbd9ea8d2e39aa521e7e5a68208db21526b32c1a57856ba24c WHIRLPOOL d93189a7715a0c445cd2a2c271aef28df8a697a57d267b0a8ec2ac00cc50f00aeace80fb5bccee74cbd2781d81790b3eb66cdebcd1a635080df18a827f8dd0d5
-EBUILD libssh-0.6.0_rc1.ebuild 2041 SHA256 fe1e5019c54d49b0f1ce61413b1877e791a0ed7afe5843af042622f08fc9944b SHA512 60c4c77131ecf2c6e2fb201f5c9ef2a518c091c58cf7e45acea15ac61f3a7afa9a192b9b7c7576a57e21eded77d1e5789bdca5acab6e0f6f9da00ae7f9977aa2 WHIRLPOOL 0dd8f2a7675ad61d023139c562a761e7141a4338b854a3f302bb159ba36a522dafe1c14a4c27edf9d52205f09740aa0c2c4ce4b75619bfc79ad6d97b14af02d0
-EBUILD libssh-0.6.0_rc2.ebuild 2048 SHA256 bd6e31356df08ae39474d838215cbcb0ab3f99c984ae01c1773054377993d682 SHA512 fe462840f70fd908edac426667f62f2504e9fb7e91e3d9cc9387a2129d681a44ac8d492ef9cebb84a60a931afeff590a54cca90e183d6e74b28efb5aee0a519e WHIRLPOOL 840f5248c42938c60fca38fa060d7239ee1f6b6b885a0c43023f02173ef6d4efe6c8f1e3d9878bea1134257de9f4d6b642ae205eb887ed7bc6a0ccedb267452a
-EBUILD libssh-0.6.0_rc3.ebuild 2048 SHA256 75fc414793b89cb633b46acc69706989a0a27094dd75c00bd48dc1fa272fd93e SHA512 30f92178cbf847228c0208601b6277547c43565c10e2561bbb00c7b773c449945b206f8ab9d27c10fb84e27c974fd86871ef635e33ae5ff45dfff766bf549a88 WHIRLPOOL 3355e1012d95819c7515b30e2c45f1389d731f0877ba38f5c55e10f93861496cec88dc16b8155eadb2b8bafa5ee81542116f8a6fd4e60d44b7a0b88ff8363532
-EBUILD libssh-9999.ebuild 1476 SHA256 f7de35a5de94e8fbf7df009e4a03d361bc8f748cdde9accae8ecad73018943f3 SHA512 a3d0afa59d38dd8046f7b6875c0ec6e9409c735998a1effae5565a7d7ba1f24433f34cd5312afad944eca0314e84543f576c72665d2eb460853e67acc9987751 WHIRLPOOL 1ba2a7fe52340a33d977950fe8caa8505cbd840138486a659d3ade186a873f34f0dc422bbfe88ef259624e9b096ffb005f5e259b4b090bb385e8a10d05d62310
-MISC ChangeLog 12265 SHA256 96caa7407e77f4d53be593a0b4eb5eb41853a4a8b3118fd149213e24be29cafc SHA512 05e8e21332d15b2ceb2908840a1f7bbcd9abbb637ea10b567b5798478d6f92eeb1e1bba210398bfc2f4ac37ac96841613d8511e19a16bce93aec3172601d21fb WHIRLPOOL da38a2a6ad1fabdbb82284565d0c67a620c230eb4a1408e2d7b970d86e94d74152dbdbab997430a60bbe1e408a16f0421bba59aca59a006bcfece0323c72a85f
-MISC metadata.xml 617 SHA256 cad0b9d4d822716fa2a55fde2b79b85456b83a555a07161190d3ad48400cae8c SHA512 8a7c2845fd7e4df29b9d7468068f0deea329e23c03aecd10ab3a4c23674cd18a6eba8ccdf45d183388ba1ebf81223f5b0113a0482db405d07204bc094dff3504 WHIRLPOOL b32090dfe53609491430204c81f8150685442c257b0611a95db11f219cd2fe67695edd5093141ce0668ef3b28628e3c537d3e6c44a17add300ccf2cfa6068e17
+EBUILD libssh-0.5.5.ebuild 1964 SHA256 8569c65bd9318df61e07214610282683d84b5e8008db9b2fddeaecefcf45ebc5 SHA512 b47dc0400d4a4c32c015d33bc74af1537e2de7436c0f874e1bedeb2e32c3e0f38ea382dae6e933bf805ca9a8c48f2ef18a6b13e97ced3c981560549219f92548 WHIRLPOOL 761b931385c04d208b3233070e038ae620e37befee96ef11d2ba7780d3662cfdaf699346cb77c3be784d53ff402452aa05c06c92c3b89f2218e29fe368424549
+EBUILD libssh-0.6.0_rc1.ebuild 1979 SHA256 65604933a699ffe455dd1c60a2ca171bfaa5870e815407efb679fb18f8459476 SHA512 a0cc7c50f0d68e45c92522a62bd04afbcacceb03220a6a414076a0a6a09078d5fa8f0729a9b3632781dc0b8dce5c2877992e33328b829251b1bd96aa7d37c8ea WHIRLPOOL 108485b93fe90e408850b12f989d30b7daaa5aed04480010f7459f811292c2fe27711b3cf35364e8c684963f24b704771b25fedb1737061475c2951df65e4e60
+EBUILD libssh-0.6.0_rc2.ebuild 1977 SHA256 0ae954866fb1f6ac2fdd045bf15f5db8c5d1b3513088ef790c0cb4695fbe4df7 SHA512 d70a0184dbe6d50757cf42508147b1ed831c6fdf9aae57874affef323d9bb5277e5135998b64f9935486d558e9e2146175350e5db95e3467eb84d4ad6392365e WHIRLPOOL 0eb96e1ec4fc361eab8b75c1c9dadc8aae3f0b4bb978b341e2c96830266ccccdb2f302dddf30db4202add032c83704c35242431cc73079bffe45ff2b4f45b886
+EBUILD libssh-0.6.0_rc3.ebuild 1977 SHA256 92489d8dc58118a730975392a2a845d33b3cb9e2819bf00ff07bd1fb3c1f6028 SHA512 c62317e7e7fda5cc78895f8c629db27c296f93a8972caf97b5833efc9a4a02c43572f2b9e0886d5d5f6962323c4b9bc57d904704ae788500c935234f2ac0f8cd WHIRLPOOL 97759600e6976b146178f38f73336543919911ae0614fb74413cc5fc03497d088b0b7f63c9023620657b09f74f841f7a454d4950a0e5864573944c503375cc95
+EBUILD libssh-9999.ebuild 1408 SHA256 0c6951113be348bd94871f9946a2a924efab3d2a921168b443f5064cce2a2181 SHA512 3881a094ae36af978d5eba1555b510cf0b528ade1fbd09f804629a256aa1dcc0fbc05f8deb3b3b82f9666b2355c710f1dae343b521b06bd37e25fec956483adf WHIRLPOOL 54ea3f9ad28272feb953536ac42648ffba471fde3d3a00f8f4dd5ed87665b644f72cfb3f6b677ccf934a28b48f2de85a31d229b0e8ef6163dc06ee60043735af
+MISC ChangeLog 12594 SHA256 fff34c31c54968ac71820003ec9c6af08d680add6a012eb567328dbde4b2ad33 SHA512 9dd91be935a7d8aae95d71ba2530ee5a039a047d80cc19eea4d63512e285d35c5ad39fa971c7f2ca0d5519132da46062e8a983046e9bafde2cdeffedd250f33c WHIRLPOOL 078fba7563dc36149d212647ea0fdbb5052cc542c6c6774309e2712ab374c6235c1bd2ba2c2e475f0ef22b23ef4a4c96603cc9f21bee9f318d3c4ceec4d8cf8b
+MISC metadata.xml 501 SHA256 f8d91b2c3830a72ff30a8dbd6f2e6911cf049c80015b5e315cb9f999e945c3c1 SHA512 1110ec6fb2ea256b38f182cd14de9a5b518d1af9d27f16782ac25154d6aff24e5c1c57217f8922db1dcdfaa336e586d56aa0c5cd06e7f485197d9e9eacd7f787 WHIRLPOOL 4b01a6f4014597e495953f0c95703cb56c23c1a1d546245aea640ddaa1e3013b88fbee348502ef86c8ac729bf12064230c4dd5786362007262bd35cceaf97312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJStFCZAAoJEPiazRVxLXTFV3sP/R6VCOOgcveZAKjFIDm/y7++
-hCB+Cbr6ZfWg59P533IzUbRvGpJhyj5l/n7lvDe+5SKIa20czM1OfGGvOeG+2tDy
-fQne037iA0+rPM5hy5i4hOCUMO6oVyefOppp1/kDa38YlFVO6EKTknKP44DlrpFm
-7613BoYIN8UQy+mxvA/F3mlTInuFKb0P9qDpjF4a1dVadjBMCRjHp9gp5Ydq5xAO
-PjyD3x8Z5cUHSs40Ll3qKhHxCDqP2ApqxLrRUGAuZb5A5U3b6lfVAZTFMeDKmp6b
-sXHpzydDBfTUKJ35DtzsETqPYm2oWPXfkn5R18zec5cDUL/+9Fqh4PcuwdV6MiZY
-obs6fclxyvG8n20DyO8UZmrI/PAyknKBI37udYTWdAOna36fD3TCK6LEpFSN/xes
-wP7KMdcGSoHQzXUPG8PLXDpQDV2JtYUJdt2+ZWF30NVUfdp8V9+rO9vHL3FT+j9v
-IXSfHY0lZc3+ckcpovKn9bCfd6MZMlOcyu35XFBzD5+xK/kO3mmsA9J1tqngdrli
-/t6hGMr+QhYF57ILyhL3cQYrnU8FO8j8MyPkKxyAnQcbk4wY9l6odLbgUoLJ3Jhi
-fNgANXNzCmUYnPowf6myH7tZcBuPPflg8B5xRQbpnsFWUvZQ9c8AJ5Q3p7owbCaA
-40QEU3NcV4DpD1p4yOGJ
-=b5R9
+iQIcBAEBCAAGBQJStFU/AAoJEPiazRVxLXTFD+cQAKVhJAwWvBKiPI7077hvYbjp
+DqKBAX8am6xnjIrpZy5SsfAv5gugdgzrIDcsjSw/OTecz+/hKDW1G137G6mahgQu
+d7/2Ctihng/Zswfj5J10kqUBp66UeCO4mbBUiQgHsj3J/VpBt4Y6TpAnTLeP4lW1
+sGKxL36JhI3CJK+55NizkCnnsJqy61Wv5WgcwqHvoK23NCNcVstsqIbGzgP5rCHA
+jqdBw6qZei2f4r1aMvATBhwUahIrOSYNmdPwMZBsKxxeLSAzHq0tnF9zb/tUKZ3q
+i4j1lWfhW/nkh9Bj9A3vAWC6X1aFLkxp7ir+98tODbFkgANwVl8rPe8PFudCldcK
+n5KjStFc387rNK5WAjm9RApbARpamsOGYfuf1BYJYmOLPzXqcfml8kHBO9T2zgZa
+HEIigiaADyD2oJr/bhKR5MqS6XBXSdkIQdcB6opASUPboolswMN0UogkFaglvTZf
+Nz9/wRbhDNMq6KMNDE4ALpFAm9IqckDO82uMs+8cxsHJvbJC/EfwnBsxzfu/KDUP
+GE1sDUKaXZXlbheP9yqdGfv5LJrKpFjmNCylLGueEKHeZUaCUq/i1FubOt9ZJ8et
+OFTtCa+NBJKC4GbDsYNJTfJMrVGCynSHYC0Hd/81aRTMd8jsrBFm9PptjsExg6N7
+dN7PICLdzm15+KQnbrBS
+=wshH
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libssh/libssh-0.5.5.ebuild b/net-libs/libssh/libssh-0.5.5.ebuild
index c45a801b14aa..51b4c509f58b 100644
--- a/net-libs/libssh/libssh-0.5.5.ebuild
+++ b/net-libs/libssh/libssh-0.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.5.5.ebuild,v 1.7 2013/09/22 16:43:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.5.5.ebuild,v 1.8 2013/12/20 14:33:33 polynomial-c Exp $
 
 EAPI=5
 
@@ -13,13 +13,12 @@ SRC_URI="https://red.libssh.org/attachments/download/51/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt pcap +sftp ssh1 server static-libs test zlib"
+IUSE="debug doc examples pcap +sftp ssh1 server static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.2 )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
+	>=dev-libs/openssl-0.9.8
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@@ -42,7 +41,6 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
 		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
 		$(cmake-utils_use_with pcap)
 		$(cmake-utils_use_with server)
 		$(cmake-utils_use_with sftp)
@@ -51,6 +49,7 @@ src_configure() {
 		$(cmake-utils_use_with test STATIC_LIB)
 		$(cmake-utils_use_with test TESTING)
 		$(cmake-utils_use_with zlib LIBZ)
+		-DWITH_GCRYPT=OFF
 	)
 
 	cmake-utils_src_configure
diff --git a/net-libs/libssh/libssh-0.6.0_rc1.ebuild b/net-libs/libssh/libssh-0.6.0_rc1.ebuild
index 011118a9ecad..4b9248abb18e 100644
--- a/net-libs/libssh/libssh-0.6.0_rc1.ebuild
+++ b/net-libs/libssh/libssh-0.6.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0_rc1.ebuild,v 1.5 2013/10/22 14:29:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0_rc1.ebuild,v 1.6 2013/12/20 14:33:33 polynomial-c Exp $
 
 EAPI=5
 
@@ -14,13 +14,12 @@ SRC_URI="https://red.libssh.org/attachments/download/52/${MY_P}.tar.gz -> ${P}.t
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt pcap +sftp ssh1 server static-libs test zlib"
+IUSE="debug doc examples pcap +sftp ssh1 server static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.2 )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
+	>=dev-libs/openssl-0.9.8
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@@ -46,7 +45,6 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
 		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
 		$(cmake-utils_use_with pcap)
 		$(cmake-utils_use_with server)
 		$(cmake-utils_use_with sftp)
@@ -55,6 +53,7 @@ src_configure() {
 		$(cmake-utils_use_with test STATIC_LIB)
 		$(cmake-utils_use_with test TESTING)
 		$(cmake-utils_use_with zlib)
+		-DWITH_GCRYPT=OFF
 	)
 
 	cmake-utils_src_configure
diff --git a/net-libs/libssh/libssh-0.6.0_rc2.ebuild b/net-libs/libssh/libssh-0.6.0_rc2.ebuild
index 8f91cf7ecd88..cd1290034912 100644
--- a/net-libs/libssh/libssh-0.6.0_rc2.ebuild
+++ b/net-libs/libssh/libssh-0.6.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0_rc2.ebuild,v 1.1 2013/12/06 12:26:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0_rc2.ebuild,v 1.2 2013/12/20 14:33:33 polynomial-c Exp $
 
 EAPI=5
 
@@ -14,13 +14,12 @@ SRC_URI="https://red.libssh.org/attachments/download/65/${MY_P}.tar.gz -> ${P}.t
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt pcap +sftp ssh1 server static-libs test zlib"
+IUSE="debug doc examples pcap +sftp ssh1 server static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.2 )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
+	>=dev-libs/openssl-0.9.8
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@@ -46,7 +45,6 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
 		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
 		$(cmake-utils_use_with pcap)
 		$(cmake-utils_use_with server)
 		$(cmake-utils_use_with sftp)
@@ -55,6 +53,7 @@ src_configure() {
 		$(cmake-utils_use_with test STATIC_LIB)
 		$(cmake-utils_use_with test TESTING)
 		$(cmake-utils_use_with zlib)
+		-DWITH_GCRYPT=OFF
 	)
 
 	cmake-utils_src_configure
diff --git a/net-libs/libssh/libssh-0.6.0_rc3.ebuild b/net-libs/libssh/libssh-0.6.0_rc3.ebuild
index 0e80bda15912..21865d126e93 100644
--- a/net-libs/libssh/libssh-0.6.0_rc3.ebuild
+++ b/net-libs/libssh/libssh-0.6.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0_rc3.ebuild,v 1.1 2013/12/20 14:13:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0_rc3.ebuild,v 1.2 2013/12/20 14:33:33 polynomial-c Exp $
 
 EAPI=5
 
@@ -14,13 +14,12 @@ SRC_URI="https://red.libssh.org/attachments/download/68/${MY_P}.tar.gz -> ${P}.t
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt pcap +sftp ssh1 server static-libs test zlib"
+IUSE="debug doc examples pcap +sftp ssh1 server static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.2 )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
+	>=dev-libs/openssl-0.9.8
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@@ -46,7 +45,6 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
 		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
 		$(cmake-utils_use_with pcap)
 		$(cmake-utils_use_with server)
 		$(cmake-utils_use_with sftp)
@@ -55,6 +53,7 @@ src_configure() {
 		$(cmake-utils_use_with test STATIC_LIB)
 		$(cmake-utils_use_with test TESTING)
 		$(cmake-utils_use_with zlib)
+		-DWITH_GCRYPT=OFF
 	)
 
 	cmake-utils_src_configure
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index cd24852cb9b3..1cf193cfb5c2 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-9999.ebuild,v 1.5 2011/05/03 11:32:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-9999.ebuild,v 1.6 2013/12/20 14:33:33 polynomial-c Exp $
 
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
@@ -15,12 +15,11 @@ EGIT_REPO_URI="git://git.libssh.org/projects/libssh.git"
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 SLOT="0"
-IUSE="debug examples gcrypt pcap +sftp ssh1 server static-libs zlib"
+IUSE="debug examples pcap +sftp ssh1 server static-libs zlib"
 
 DEPEND="
 	zlib? ( >=sys-libs/zlib-1.2 )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
+	>=dev-libs/openssl-0.9.8
 "
 RDEPEND="${DEPEND}"
 
@@ -37,13 +36,13 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
 		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
 		$(cmake-utils_use_with pcap)
 		$(cmake-utils_use_with server)
 		$(cmake-utils_use_with sftp)
 		$(cmake-utils_use_with ssh1)
 		$(cmake-utils_use_with static-libs STATIC_LIB)
 		$(cmake-utils_use_with zlib LIBZ)
+		-DWITH_GCRYPT=OFF
 	)
 
 	cmake-utils_src_configure
diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index 717803a72cc5..1b2d5d48a323 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -5,8 +5,6 @@
 <herd>kde</herd>
 <longdescription>access a working SSH implementation by means of a library</longdescription>
 <use>
-  <flag name='gcrypt'>Prefer <pkg>dev-libs/libgcrypt</pkg> over
-  <pkg>dev-libs/openssl</pkg> for encryption</flag>
   <flag name='pcap'>Build with PCAP output support</flag>
   <flag name='sftp'>Build with SFTP support</flag>
   <flag name='ssh1'>Build with SSH1 support</flag>