Update the live ebuild. Use git-r3.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 61 insertions, 34 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index a8b5f31013ba..87f2152ada90 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,9 @@
 # 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.106 2014/06/11 19:53:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.107 2014/06/18 17:35:12 mgorny Exp $
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org> libssh-9999.ebuild:
+  Update the live ebuild. Use git-r3.
 
 *libssh-0.6.3-r1 (11 Jun 2014)
 
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index b168c5c29f6a..acf7da4f0a8a 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -11,25 +11,25 @@ EBUILD libssh-0.5.5.ebuild 1964 SHA256 8569c65bd9318df61e07214610282683d84b5e800
 EBUILD libssh-0.6.1.ebuild 2115 SHA256 aab52e0247f7ae22dc82b1c1be14d5ed7e23e09567f88ad3f7dc2f19e0106de8 SHA512 8f3bd606cbafd3b124a5a24d5bfb2a06d9b0885c1c0dc02ba757fc5aac90b957a9a1c6b7ec769a86b4754b799fa0b91bdc8235d8bf1e5640d76f359b5954f91c WHIRLPOOL 706382b3fbb64fb82dfe77503d1612c7ecb554b6d072d4ac11223d113a1c1700c7daa89ab5133a58877b307930c0180ba100940f0641b5900e02d4fa39d93e08
 EBUILD libssh-0.6.3-r1.ebuild 2335 SHA256 fba8da0018d4c8cf3dcab4b7d71a3e91819aa00e9ee856a4ea2469732a4ceab0 SHA512 8affaf165b099f6ad70a4cd068c033b61cfd27d7189af105cccd4c990770aa2963ffc7c0ec46f4ecf5c53f5dcc326bcb4fe3fcfedacce2f50a463fd93f868956 WHIRLPOOL d5d80b7cfd5d57230ce453b015d4f77ac217d4a601a49ebf2fbd82e5de116f85e0d1b843d3cfa39b335ef417943f707b199ee7292d27111c6f725115088ba0bd
 EBUILD libssh-0.6.3.ebuild 2118 SHA256 509bf1d8f6e79b9d6d51e7074722c905b9b8c0ac3d824e138d7a317fdbe7d866 SHA512 4ec9fa7fba64f19b883f7bdbbc693605c1750bf1adf7353c0cf7a2d952cf22175bf19ee2f8e7f8262eb03932a4493a89e7fd315859fab7a4565378240ae01a5a WHIRLPOOL bb7c456f6a93bdcb00b7fde3ac6223448e1b173768565f264f1aa043483f96824b2734aa131a7e50aae6722b7e5e065a6b151b0becd4611d7e7ba0f32883b004
-EBUILD libssh-9999.ebuild 1408 SHA256 0c6951113be348bd94871f9946a2a924efab3d2a921168b443f5064cce2a2181 SHA512 3881a094ae36af978d5eba1555b510cf0b528ade1fbd09f804629a256aa1dcc0fbc05f8deb3b3b82f9666b2355c710f1dae343b521b06bd37e25fec956483adf WHIRLPOOL 54ea3f9ad28272feb953536ac42648ffba471fde3d3a00f8f4dd5ed87665b644f72cfb3f6b677ccf934a28b48f2de85a31d229b0e8ef6163dc06ee60043735af
-MISC ChangeLog 14877 SHA256 a5d4a51ed6bdca942c13c615cea32824b9d2c1eb7170d5619d55040ee99a5667 SHA512 b38f71a7c1ff1efcea7340115b227e09093596ba48db6b9a79a38a63fd92409e2edf3d8f63fbda00b59ec8b3ab3a7b96796cb621b19991ce2c814d7a1035c0b6 WHIRLPOOL b7cba068e21af9ee5bbffacf4cccc2ce56914cfa611ee0702d2cf62435496c43ee4da6ab90fdf89ecade594c83a4743889f5f3fd5070b8e59eb630d3d539c06c
+EBUILD libssh-9999.ebuild 2139 SHA256 cabb07573a89245c179b846c7768577c3385f2ae9aded62cf919d8434863982a SHA512 360f39127f1f25b3c09fb8fbde59d3c0193e555610601b7186abdbda3b7face8d1cf4cf47d9ce28b437cd2030db751bd8653821ef134d6454af9b8aea3fd403f WHIRLPOOL 1c8dab2f97cf347970f24099331142da32ae06758dc4820d91272cb6bec6c91bf4c55c19184cd34a3a0e9566fe372cedcd9f23d8bb17a27c294e3904d68dcac9
+MISC ChangeLog 14986 SHA256 2246465e0afcfbd5a803063671c541b72fc06213fa980b67f6a5e90e79d49ea5 SHA512 20b2ae5bede86ac701f8e73a3fedd83edee28c2e6d5ab31bf6dd80333a2188d064dcb6e16959d6022cdab67fb94e0d5c7c91afc29155f37fc9ca5aa108860083 WHIRLPOOL 64e8e290b3e770a4bfc9b336181eef74376a68314dfe3b758966c098e3cb2fbe7230d117b5ec2fed35d1a1ebd9f2fcf533d2e298098851bd8cef494368a476a1
 MISC metadata.xml 670 SHA256 8981afe1391313974f7ad026510fd41912ab51fd2944875d74f5d10ac0437571 SHA512 ff239db00413a0a8bda4c056627fc99442e1b37ca91d1cd32b86f616885c7003bc8585954c54584bd260dec8fe3d8335b413e47884bd35d4dc58d46689ae8267 WHIRLPOOL 0f7a409bcd626ab9dceee9050f6c23eb56388925ef08b3f9fd5776dabd26afa8ba3e55674e94a886b9b2ca01dd51cf5fb027094283726744d7efe971192fde3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTmLPPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJToc3SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOl4IP/jyiXGJzTE7F+wdwgshPH4nJ
-wgEk8FTdIdP87B5lGPgkNTDyuygNaJwcns7wetmuTcE/oZMjhNjS6PflpDpUjIB3
-5eLIn0ov6ppteDkR0RkthZw7C40h/Y0naVfpYaKz2lWyBP7UFDFkJX5QA4+ZDcYG
-07139BQFAOnueZLOsP/dB+u3ZZnml0nSbX5i4GK/0wXlLdKNDTDNhHITRagb+3Oq
-x4jaGFijgpV7cdLYFdkIS1t/iyidmYhbqmRw27rtgIsLIjlVlIkOxwe73UbKnzAV
-k10qOSmmbIPofDkgMoTDhksOvCf6nTCnBjwHurGtfiMrZxljpdjSiBNQZhpjzcTg
-hto6eoavQoDO3gQl9Ti456KbsV1Pc1W3WP0KAKp2T3wIeYEgsrxlBEFRpoZwDuhZ
-R1HGzE7rCTRjWcfkhS5dvH/se4iW3ehWUoNhb3tfKqaHheumVOp9U6xzzo+Og24l
-nZII1qjReLwkPbJsIAKkHvaaYqmKO8xqpweNuOZlp6jJiw04NjDvnKrY9NgNEfjU
-2kvqKNt3IBoa2J5h0OgDTHfvcvgkIbi/1W78sG4XReGr/kmNRMhPKleUGvteRcuT
-80KcSDNlb/vwNiaa/Q1CYICKNJgr4FhwSSPTMkPCqsXTPZY9x9Hf+04rBAEJLO+j
-Fg1rJ6EuUE7iVaCCKIFk
-=T0mC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOnGAP/Rb/89hjGoQWIWESl8kA7NK8
+3OqUvMDwP2kXE41OuA5Dra9S5yE1b97cJ5DGyRwcM4a5zZ81X9BWVvyTKYTD7f0+
+YFMHIAP+g6KFq5mmPCUGhukntLE+EJQuoo8weyZEDhlYAgioyCIpsbtq7q0HuXUi
+3tA6d24XG2f+kbs768yLgm2sJ8qJxfVto3ijGKgMqeSMxvFNy1E4/3WwqGrNABxb
+mjYfy9yUi7u/ta96f83d+8ZQO0N3XpVujyIKs5ddv+XYM5dmZtz+870QNrOIw/ZW
+i08CX0KTH/nflOnanbeP7vS0N1q5MqcQeqFRU6ml06YzJJAL9zN61nrw2V/hncnH
+xaY/haBJ2iHHDJeJWF7TCXOE7pttcKgHMqyA8ADDOd5uiqFLQ3o3/So6T9x3CfRd
+vJK4kcsPwJ5DKS2R6P111in9bdORMKfnf85kmEZrAFAK0rRYb/Al6NeJO/SK0vDj
+Km0W7wZtPVlBXo7dVVa/ME7ERhfVnCNfMM6D3AMa1/mZokQrZnnrjwxFYZjfjcr4
+kHe0ZBpY4LelsPxCrPniPw88bERL+hbkgPfhp821sZOkG4QPdnUOh4sPUO/pWzUr
+XDhvEDAhGj7XFuie57Sji7H4JyiIvtsAUCmK2Tu7JmI5w1qakvSOfaLeIhmJqx5M
+4w5S6A4g8uTnjTkkWse5
+=9bq+
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 1cf193cfb5c2..0c8119723540 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-9999.ebuild,v 1.6 2013/12/20 14:33:33 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-9999.ebuild,v 1.7 2014/06/18 17:35:12 mgorny Exp $
 
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-EAPI=4
+EAPI=5
 
-inherit eutils cmake-utils git-2
+inherit eutils cmake-multilib multilib git-r3
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
 HOMEPAGE="http://www.libssh.org/"
@@ -15,44 +13,70 @@ EGIT_REPO_URI="git://git.libssh.org/projects/libssh.git"
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 SLOT="0"
-IUSE="debug examples pcap +sftp ssh1 server static-libs zlib"
+IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
 
-DEPEND="
-	zlib? ( >=sys-libs/zlib-1.2 )
-	>=dev-libs/openssl-0.9.8
+RDEPEND="
+	zlib? ( >=sys-libs/zlib-1.2[${MULTILIB_USEDEP}] )
+	!gcrypt? ( >=dev-libs/openssl-0.9.8[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5:0[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cmocka[${MULTILIB_USEDEP}] )
 "
-RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS README ChangeLog )
 
+EGIT_MIN_CLONE_TYPE=single
+
 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() {
+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 zlib LIBZ)
-		-DWITH_GCRYPT=OFF
+		$(cmake-utils_use_with test STATIC_LIB)
+		$(cmake-utils_use_with test TESTING)
+		$(cmake-utils_use_with zlib)
 	)
 
 	cmake-utils_src_configure
 }
 
-src_install() {
+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
-		insinto /usr/share/doc/"${PF}"/examples
-		doins examples/*.{c,h,cpp}
+		docinto examples
+		dodoc examples/*.{c,h,cpp}
 	fi
 }