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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

7 files changed, 28 insertions, 29 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/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>