Version bump. Fixed gssapi switch

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

5 files changed, 113 insertions, 21 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index bb35f034add9..bea714b0354f 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,12 @@
 # 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.97 2014/01/09 07:56:12 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.98 2014/02/11 10:23:20 polynomial-c Exp $
+
+*libssh-0.6.1 (11 Feb 2014)
+
+  11 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> libssh-0.6.0.ebuild,
+  +libssh-0.6.1.ebuild, metadata.xml:
+  Version bump. Fixed gssapi switch.
 
   09 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
   -libssh-0.6.0_rc3-r1.ebuild, libssh-0.6.0.ebuild,
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 15f3131a5b08..181897011b15 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -6,25 +6,27 @@ AUX libssh-0.5.0-tests.patch 473 SHA256 aa57848a7e67fe4e62bad6ade2dbeb45c616b03f
 AUX libssh-0.6.0-libgcrypt-1.6.0.patch 2735 SHA256 4317125383e02b6e19d935ba7f61e5f124f8bab4155ce4ec5bd773476c415d33 SHA512 d3e576cdf0aea4267d8da83fb62bc70e4e3fe35719e15dcc5aca1b01e60651f3c52f7733d42f8a8d75c562291a587f887a9931868e453347b36ae530d9606214 WHIRLPOOL 3f720d2d9c4d82a21a56a1722b63f7ffe974cc6a11a236e235fed2ba9a46f2b7e364b3919293e6ec74fcdd50de5eab407d78c75895d3155526bf4761013a99d0
 DIST libssh-0.5.5.tar.gz 321583 SHA256 c0df0f05fc812dbe26fd4118bec0776aa9e892c0719590f3971130489c6b8e9d SHA512 114a8d078b9530fe37f12c769283213ceacdd8cbf0c1c3e64e09c07d38b3886bc8c9a78816562ab1bc44c55c604fcc4ed85cdb2a8203962c9331f9d10977e802 WHIRLPOOL c12f543b5613641cd52a29f57e540a2ed0aa91e538172755966d440f0e0905e48c9c4ff3f263dcdfe8f3e925045856650e2f5ededc232be4bdd731853646764b
 DIST libssh-0.6.0.tar.xz 275664 SHA256 4c6de7caa23debbe4639f83fa2ff411924643e65356d6af048daa31e4a1a2f71 SHA512 6680e351b22ce6629047929dfcb7ac02dd7c332af5995191dcb72037ef727bc8c9394760517f79a58f8f7e489c29581fc41f6c7bc08c187ef5cb6091b66ab6a7 WHIRLPOOL ec64381cd80300945cba5a64f057dca8cd7a983f5fac8a06138aee2b6451f6e8619aed97e98487cbe860d488458139faab467155924ae2d55f8e58db88eb4a66
+DIST libssh-0.6.1.tar.xz 279324 SHA256 0dcced0faa74bcededfbaeb14898ab85bfcd39e736f9b7b589cf9c833ca4b1fe SHA512 b057008406f6992242f360d9de8cbcdc42a87feb5ef0f6ff33295978a39ca3e0332351f1f9fb059d6270a43680403ab625a0a6d5851d61ad713f62cff6267470 WHIRLPOOL b28ceb649dbe2504786445c90666adac1e4fae1affa6a976b06dfa5de552ae720ecccb82f357debbc079e723f4d017a34dfb05c34ddb6fc27ef022e518560282
 EBUILD libssh-0.5.5.ebuild 1964 SHA256 8569c65bd9318df61e07214610282683d84b5e8008db9b2fddeaecefcf45ebc5 SHA512 b47dc0400d4a4c32c015d33bc74af1537e2de7436c0f874e1bedeb2e32c3e0f38ea382dae6e933bf805ca9a8c48f2ef18a6b13e97ced3c981560549219f92548 WHIRLPOOL 761b931385c04d208b3233070e038ae620e37befee96ef11d2ba7780d3662cfdaf699346cb77c3be784d53ff402452aa05c06c92c3b89f2218e29fe368424549
-EBUILD libssh-0.6.0.ebuild 2173 SHA256 4455c2787d6b98d348ca8e0f1364d76c29e46e0b081b8d98dea75177d953186c SHA512 ec3280c9a7b3158cbe49fd81516fbe680fc72342923cade603964e9dbf623ab929337562f02e086dd6379e5724fff51e2e377b6cc3e64268aaa8ac3030e8ebbf WHIRLPOOL c93e8b33db9be82bf85c48482a2524f813115023ea66d615610d89f0b02b19ef992df55a10d1c64d473c2a384a67cfa2d67f7dcee98b63e4507e4a5ccbe8709c
+EBUILD libssh-0.6.0.ebuild 2160 SHA256 10344f57fe72268c83d35b7f24dd01a32c16a8a42f7b0db69075aed53aa5d806 SHA512 2c6439e06e89525edd21e82892391ecb25f8ed8332110656d7601a9b9189ae31fec51a9af7f770353af05a3b9dfa62fbdfe11b0a8b50df9d3bb98395581b7773 WHIRLPOOL 25f0c4abbba76944a1bbe78be94d864dd7149b2b65a814779086c3c25277e867768ffabf99001e1f6d4d48b435f2ad1aa9903001cb30bd6d5008ada3e889a4f3
+EBUILD libssh-0.6.1.ebuild 2111 SHA256 b8f77fa4c01ce514c703bdeb29010bf1d174bd8dadbd9a332d0be19e0bb34ee7 SHA512 58734313cf2f7b5980ac2d601593712edc53c3247d4dd4a16d253c5b7724d2e860137b864e29e83e128ffcee4e6ccf9f0a68f2025ee55c5a20f104b56f7a593c WHIRLPOOL 72701ecc99f11fac05b42750258ec796443960b0776197ebe9b2a8bb13b23e593dc463f274f00ad2b9c1bae086142140f390fd5b36098aa2de5a486bc32e4018
 EBUILD libssh-9999.ebuild 1408 SHA256 0c6951113be348bd94871f9946a2a924efab3d2a921168b443f5064cce2a2181 SHA512 3881a094ae36af978d5eba1555b510cf0b528ade1fbd09f804629a256aa1dcc0fbc05f8deb3b3b82f9666b2355c710f1dae343b521b06bd37e25fec956483adf WHIRLPOOL 54ea3f9ad28272feb953536ac42648ffba471fde3d3a00f8f4dd5ed87665b644f72cfb3f6b677ccf934a28b48f2de85a31d229b0e8ef6163dc06ee60043735af
-MISC ChangeLog 13711 SHA256 a259d3f7b47636335dd38c1ece35b83af84686d445308c9269f8a2bed3eedc87 SHA512 1f88f477442a152c5f751b737fbd10e6cd95c879fcd298c2149b174a8f2eda68fc79eb283948b8c861630de27770730534432178b2ad5c8819ae11368bf64346 WHIRLPOOL 6d12e3d8cc5b54b6478189fd4e16dc8f0b666648408e7e975cc0f26b4adbfb9c0a576a4bc5fe98fa7f27d943bde9e20b116d11c13d952d11b7818d3745e8dfe5
-MISC metadata.xml 619 SHA256 ef7f4dd8dd2f49858dd18a07cd5ad6ed24a3d611981826384fc9377e3213cff0 SHA512 c41a2ad1ce2338d4af05cfcaac8be57bb18fa691b06b3cf29d36e9ef4476bfa854fde088720fb74d3b8616b15ed32f5eaf3899c4c5b65a47446f86370bebbf8b WHIRLPOOL 71b7b65f71cefcd91243f27f4efa55075744fa7139c567cec00c09faf8285817daa0630b6bdd07c6c7bbe6a8970e6b355e9671ed9ca3fdb2a48fc5df6b630011
+MISC ChangeLog 13891 SHA256 2209a3a66cc061aafeea2cb9e4ded344487b213a64e25e929df181861df120c0 SHA512 3e6a260236e165d9122025049cef29b0d83e46c203ac13acccf3848abb69f5ebfe2e3b3fd8dcb18015e1b49d496f0018a8c4133e837191c2cdf7144f2445f214 WHIRLPOOL 8ec72eda087197d5a468380dfa75bf40c1b1f7ca1d36cac57ab21b93f7c1d731cae634f9659024c187d27c9833b923b9c9299cc5edcf40f098a7f18563527ca1
+MISC metadata.xml 670 SHA256 8981afe1391313974f7ad026510fd41912ab51fd2944875d74f5d10ac0437571 SHA512 ff239db00413a0a8bda4c056627fc99442e1b37ca91d1cd32b86f616885c7003bc8585954c54584bd260dec8fe3d8335b413e47884bd35d4dc58d46689ae8267 WHIRLPOOL 0f7a409bcd626ab9dceee9050f6c23eb56388925ef08b3f9fd5776dabd26afa8ba3e55674e94a886b9b2ca01dd51cf5fb027094283726744d7efe971192fde3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzlYdAAoJEPiazRVxLXTF/zEP/iUBN3GGxTIWmV9y9MOYDWeK
-kGw1812WQi+xSJo3UE/v+T3lzPjL7ePtDLfJE1z/kK8yxkFEVzBtzMRy4mYizCmr
-aAObGJh+kH0VrzVURBF5ANKFQrymiGDDHvvw80bAIeIUwQqVD+5Wq9utRG7dxVnq
-tyD8fFut0JqkKsS0mNch6FjAhK/mrQCH0ul/L2zyA/MKtaqovQBUO5Bi7vOnXfFk
-i6HWSPDWHUgUx9i9ZQEraQOgI1P1XOg7Obe1yPsm8fiQy9G1r/PkOygMZ9WWavhr
-8ntomojOYSUaMFDk21mVQeUNNi5o1WUzDTVb6vAfMgtw2Dm44+qYtHD2+rn2etFX
-s44/wd+HDkvX4IkDXR1edQnV1Npq3szzumcw95LQNUiQcoBvdHWSZBa9WqKOMjd5
-Od4/4MtrVM1NvvgoHSlmVkQ2R92hqT2se2WmTGPefbfpJEq+ZTN1KqAXJvxXmJNK
-P5lgn13nvsGRf0q8cVRJJjyFPC4CPvUYVt1C5GDE6HTqctVFSIceW1MGwT+ujBoO
-VwDVgRojZToKP7cZVNc3kbKzIlGMRPkcqvtgaSp9XTE30LVixG7SJpgyRXJf1mWO
-vbfNIzGKpfiDYgMOwunBLvyJanPYgW81UcI6+G8hcjr3Zxt0ojb2hWm2ASda2B0L
-Xwp7t0SqZo5rJeqJumk0
-=7KzK
+iQIcBAEBCAAGBQJS+foZAAoJEPiazRVxLXTFme4QANvXYJSbzEHHADELokakBT1/
+UsNHqKMpY0FQsBuEKZ1m9B0FJiwzlS1IcQAyp0tBGZ4QUU9GKuDSZoe85llTNSJZ
+vH+Far11tMhvSvzxK2df5mH1nbYEIOclVlSfxly3aZtZbed04h0RKd7SPxtUtSbG
+dpSrbmCnaxv4oQaK/5lah8cbpN2qLbBHP1QWDhgmBlQhWxfmm/p27aMM1kIzXKq6
+sZAb9yvX3aiEGEBwCkNBRfgPIQYJxaTBga/MOKY8oW+OOKxfkXjE6ySO1lupA/JK
+1UDbgvb0sIJXxcX4MozAEDVWrbYx5u/ee4Jv4+SLX5ndP8tfXwmRWpuysGklgzCZ
+8LyJP3i7AP3AeBlLS9xot0ifuV9iuq4IB0KuiYkX34xTaeMkrDOsnRiO1DcR8fAC
+roOdgP0cnFA3ub2tWqhVNcbZJSGse5USSItfBVbceTnrYEGMMj97BhkRCileECXr
+tDPCNRELIrDoymGCvOgBbF24lu62c6C2g8t8ERjjMDcX8sTyVT1hgzJE2E8vnEC2
+4OcOEv8DJM/frV/2kGdx8StmqQkg3J1Yuy+eORaUVWj70ONjWkyCHq9pW4PgOW77
+dZ9U7nwlg1Ywl4qvM9ycUibmM5fm1OcEPmjiL4S90d2U4gNfT5blO5kTSfIgYS5Z
+LstVzsli131ULWWJ2e6d
+=r/MG
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libssh/libssh-0.6.0.ebuild b/net-libs/libssh/libssh-0.6.0.ebuild
index 97545d3a6be9..4b30c9956cff 100644
--- a/net-libs/libssh/libssh-0.6.0.ebuild
+++ b/net-libs/libssh/libssh-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.2 2014/01/09 07:56:12 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild,v 1.3 2014/02/11 10:23:20 polynomial-c Exp $
 
 EAPI=5
 
@@ -14,14 +14,14 @@ SRC_URI="https://red.libssh.org/attachments/download/71/${MY_P}.tar.xz -> ${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 kerberos pcap +sftp ssh1 server static-libs test zlib"
+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 )
 	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5 )
-	kerberos? ( virtual/krb5 )
+	gssapi? ( virtual/krb5 )
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@@ -51,7 +51,7 @@ src_configure() {
 		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
 		$(cmake-utils_use_with debug DEBUG_CRYPTO)
 		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with kerberos gssapi)
+		$(cmake-utils_use_with gssapi)
 		$(cmake-utils_use_with pcap)
 		$(cmake-utils_use_with server)
 		$(cmake-utils_use_with sftp)
diff --git a/net-libs/libssh/libssh-0.6.1.ebuild b/net-libs/libssh/libssh-0.6.1.ebuild
new file mode 100644
index 000000000000..6734475eac2b
--- /dev/null
+++ b/net-libs/libssh/libssh-0.6.1.ebuild
@@ -0,0 +1,83 @@
+# 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.1.ebuild,v 1.1 2014/02/11 10:23:20 polynomial-c Exp $
+
+EAPI=5
+
+MY_P=${PN}-${PV/_rc/rc}
+inherit eutils cmake-utils 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/81/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+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 gssapi 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.5 )
+	gssapi? ( virtual/krb5 )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cmocka )
+"
+
+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
+}
+
+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
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/*
+
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,cpp}
+	fi
+}
diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index c2c255c6361d..962cf0114398 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -7,6 +7,7 @@
 <use>
   <flag name='gcrypt'>Prefer <pkg>dev-libs/libgcrypt</pkg> over
     <pkg>dev-libs/openssl</pkg> for encryption</flag>
+  <flag name='gssapi'>Enable gssapi support</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>