Version bump (bug #533366).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 99 insertions, 15 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index 8f5535af0261..e17fbc0296e9 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libssh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.116 2014/12/04 08:36:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.117 2014/12/23 08:35:29 jer Exp $
+
+*libssh-0.6.4 (23 Dec 2014)
+
+  23 Dec 2014; Jeroen Roovers <jer@gentoo.org> +libssh-0.6.4.ebuild:
+  Version bump (bug #533366).
 
   04 Dec 2014; Agostino Sarubbo <ago@gentoo.org> libssh-0.6.3-r1.ebuild:
   Stable for ppc64, wrt bug #526074
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index d5efb532da3a..4a53826b630a 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -3,25 +3,17 @@ Hash: SHA256
 
 AUX libssh-0.5.0-tests.patch 446 SHA256 d23cf31e1fe6c0e1b1ee31f88a74b1a02386d75ab72063a39fea8c467dfc3383 SHA512 e751ac1c3749ecbd8ee2f960ad09e861763cbdb9bccc7c95ae27ca4768e8c9ae5ab55342151a2799f8f937e63a8729bff6f04cec166bb9830b99f8f690da4825 WHIRLPOOL 55031d07f02fe43f32391ae20e78b5a689df342e96d0feb2a03f674251b743ae502955e9d1e93539ca4f25f2eb151d8d02fb594e509978356c4bae90fcdca695
 DIST libssh-0.6.3.tar.xz 279492 SHA256 2bb5d7c595059f990a8915c190169257328ffa828ced0c05b09bbe186092cacb SHA512 8a9afd0add4f7e4b8ca237badaa9e248153cb3d069eeb3a5e752703545eda44a2556f93a4c60d3eadb3e950bc0848caa114fc54572e6372d740cbf8a63ab3b93 WHIRLPOOL cfa84307291196409367167ab223b2312db1760da53cec8a4279cd6db7867f173dc900e1159e00ef7ce91a571c5d8ac04f58816ca5cf44176885c82c10118bbc
+DIST libssh-0.6.4.tar.gz 381835 SHA256 7e3205e2e95bf35b23b83a6485a7d59abe7c7546d01b728f691cf0c374216b52 SHA512 02c1879d7afed9cc8404366c343ea770e97fcdcc7cc467f15b762b2c5724399de3efe69fdf6ee86a607c0f4d2337586f34150b9e0dcc8ccd8e86de79f574cba5 WHIRLPOOL e086afbe604905bdc024a1ce7503644285fdb394a168b6049e44751c64cdf51ba9e036a32f568d749252ad537fe9f874eadb8aea92de580f9c93a9d91a6ef457
 EBUILD libssh-0.6.3-r1.ebuild 2368 SHA256 1c268618f2d7c84e8af8977726452b9a950ab20af172b198212081b0f9ccedcd SHA512 a99f10224c61e1b499f3d5126efeefe8df221d8751675183867785e10b38eb05708891cc53f596ea00f61b4364a0a44460d742c20cc27354846c3d6bc8bcebc7 WHIRLPOOL a90e885676b2dedb30dee4d1cc01fd95db75d214b3e7f31b49746037a5fc3216000ec39efb3899a55eb92afc22eb9ef71d3ccff3724046788305a462fdef90ac
 EBUILD libssh-0.6.3.ebuild 2125 SHA256 d96dca528493f0b6c81263adfc7ba9fc7764bf9afd82356b19401ba1e2b9ccce SHA512 693ee0fb04c8a81b199a4e4cb11c63980f230a83399a0683c89ef76f6feacffce3157feb27a9b5aa76cbecb0758943181c6d1ac3d57fe773f2a924bb55d71430 WHIRLPOOL f6ec7de8457809f2a6ff970b0807b918ca4a843979bfc67a8cd8f28f4857db189ed004f88011f6f31e58ba90b0aa54e68dac8b8ab4b30ff877234d5677744598
+EBUILD libssh-0.6.4.ebuild 2370 SHA256 6fc1aa91384abbb66d8da137cfb36533634350133a0a163fb8d6c34592b3d55c SHA512 210bbf2561ba959b2b1e38719ee3589d3587fbc30778595e682c9f815259e9c2631a4acc012ca85dc66d36d6cf3175aa6fef20a954154c43a156ed5dcc0444b0 WHIRLPOOL ea55e1dfec16d14c41301e532e732dab8df4358f676d2f352662db2be76d7733bb9957c2c5753d6a08efff95c809bff4819de2adf33104c4afd12dd969da7f7b
 EBUILD libssh-9999.ebuild 2165 SHA256 19217cf4a65823f37239ed541e83e6ec8ded43668fe7bb6bdb0fe3900de22009 SHA512 92222628c3851d025bc645ced70092687af28c1f264621d3ac230e87d4b2269f8e09838f1cafd53191457fbab4b8e683914f25213c46dd673e012d2c36d23665 WHIRLPOOL c2dd2212aaef30e06abec149f8e4cc661998feb89c4eeafad6b67ea37ccce597e907fd1bcd02a9d27dca8febf0eeaf9c5c4edaa81f6566c2603131f52e13edbf
-MISC ChangeLog 16212 SHA256 3b8589e8b101610ff9777582856eb94d0f31f4eaec5a7226feb5211a0c13030c SHA512 2f287539cb784735de8870a45eb7856798b930201c7c9c30faa50342aaab83bb5fca2e5d27694e5f09a05279e2ef768d01cd303e539916e29065bd5cbc5a4b64 WHIRLPOOL aa0996c7246db62109c0d5bb5d768461d4f7020686bc2ceb27f1eea014f31ab007ecee8246ffeb72c2aeb7280f55cfa1bdbaf69f7bc4d3413e70ee6a29812df4
+MISC ChangeLog 16341 SHA256 3217eb46453de809d128d8aaa0b4618d8b62300abda74b8029cd48cdbd69ecc3 SHA512 d1ca88aa3cd11f0d98bba49fe0650b6f782d44b6b9e1dd657f2357d825ff073f03baf71b31aa16bbcfd1083f014baf5d2ec220f3605a22e6f37bac63d1c26691 WHIRLPOOL 2fc3ee99cc09391167f0493ac3ef3c6c09a18f63e79145b1f8a9ac638dd251fc2e57ad7780ebdec80daa5b2c6a2289bb415f6ae001e365ca1fdc27da853c2ad8
 MISC metadata.xml 577 SHA256 fe4b1a79301454baa0772dd181ad10ea5f835a904d1eb71c94890bd276891116 SHA512 dcd1badfa0be8068167dd095631366e968046fba7e5f62851f2f7c463ba8c8af427ec487abff41c236f269fdfd376f5716e4ffa4a5042f2ab82bc5bdb85b21e6 WHIRLPOOL e9731fd1b62a2d0d5836420585f8a31f11bb6f5e3ff12d9853ccb66321dd63642bddb1f128e117ebd1f7f58209f17a98f14c8b7e9c1e1b091c6ab668595ac524
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUgB0HAAoJELp701BxlEWfxusP/1WgZWbPgfAvubzerHftPNH9
-fNSf/1P7IpbnEU3GPgsfqAWAM15WQvkY98XdUlHVjPNIQFSzu9XqcoAYLCBLmWTO
-vG+7bxmqFULF5CIiToC9Dk8XuxX6Gug/yaE7NmS7T8GG8TIr+pjMBKtsBcUdCFom
-brZP0NhJ+nHpcBIToNoUvKIs1epHnQ2TWZegS9kDfLihcZ715NjGViQ7+OOwGykB
-WZ70CMpC4nRhHuFBceH+e0LSOmTAsfuJR3+b1dzDqNUIN2csu5ASoPQqbmutK1Sc
-p6meyfGU8PFNmhboocjpT3QaLKWNhLTpvmcX4+2lVOaqYW2fiNM8TDOUFL6p7QDh
-Q68StzrdQI42sHxs6tyIPCB1St2uKc80XhqunGMDwS+GnfTJYyHsEgnEncbP4eiC
-MwBffdtahSqju6/4jZKuWWoU7NGoZRT2WYOVgRUTTtXFcRGTPF8UyMV2xkALkLzZ
-tcHIIWe55e78HxUo+gOmvICKkt1g8wU1AhkSsGA2sIM3PYFro3xQ7oV9dbolLI5K
-rcsQaS9lthAIz6dckol8A6Pxf792WV+qKP/uDGh07aQGQD/lsGHDw6kDdoNyJ+os
-u3X3KX8p+ZiI0NPDKAxTrhdOqe3hj2YbJjNYfmFH6/pVynk2anh++bjQ9DzXmSi0
-L/D6LGPXD5WbWLqn20Rz
-=/mOM
+iEYEAREIAAYFAlSZKVIACgkQVWmRsqeSphMCIACfbr043p93t4g4bE9dLcHE2EwA
+TTgAn0Vs4pp9Tlaw0O4C1ICno5Bt/oT4
+=Mqhd
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libssh/libssh-0.6.4.ebuild b/net-libs/libssh/libssh-0.6.4.ebuild
new file mode 100644
index 000000000000..e6e1521f5ac2
--- /dev/null
+++ b/net-libs/libssh/libssh-0.6.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.4.ebuild,v 1.1 2014/12/23 08:35:29 jer Exp $
+
+EAPI=5
+
+MY_P=${PN}-${PV/_rc/rc}
+inherit eutils cmake-multilib multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="http://www.libssh.org/"
+SRC_URI="https://red.libssh.org/attachments/download/107/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RDEPEND="
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-tests.patch
+)
+
+src_prepare() {
+	# just install the examples do not compile them
+	sed -i \
+		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+		CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+multilib_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 gssapi)
+		$(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 test STATIC_LIB)
+		$(cmake-utils_use_with test TESTING)
+		$(cmake-utils_use_with zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	multilib_is_native_abi && use doc && dohtml -r doc/html/.
+
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,cpp}
+	fi
+}