4 files changed, 34 insertions, 86 deletions
diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index 8fa5b774b071..8085b4fc761f 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libssh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.63 2012/06/07 22:00:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.64 2012/09/20 11:49:34 scarabeus Exp $
+
+  20 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> -libssh-0.5.1.ebuild,
+  libssh-0.5.2.ebuild:
+  Stable on ppc64 wrt bug#419273. Remove older.
 
   07 Jun 2012; Brent Baude <ranger@gentoo.org> libssh-0.5.2.ebuild:
   Marking libssh-0.5.2 ppc for bug 419273
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 0523cafa4fe9..f32a03fe76cd 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,9 +1,27 @@
-AUX libssh-0.5.0-no-pdf-doc.patch 1195 RMD160 496f4c7a2ba7826cbf79822266d2456cd40be297 SHA1 b71b64be55b5c32838dcde5cbb8d04dbc4911bde SHA256 116f436073bb6eed8ec776828efcba399852019483a10da2691b3d350570c793
-AUX libssh-0.5.0-tests.patch 473 RMD160 b0d2af4276ae19f316c2e2ec5bd372509aa2e825 SHA1 48f40afcc4ce97c8b004a714913f8b73219060f1 SHA256 aa57848a7e67fe4e62bad6ade2dbeb45c616b03f9d38594ac90deba893c649c1
-DIST libssh-0.5.1.tar.gz 315848 RMD160 e56faaa015439d8976349d94c542474fcad86b78 SHA1 ed48e13890186d86214f165477aae6c052a07635 SHA256 55ead7b7858abecbe9295d8699d6821514d41adfa76a6e47cb3f859ffa630a87
-DIST libssh-0.5.2.tar.gz 317336 RMD160 7e1352329dc0b212495122d5737ca821d40f30fe SHA1 4bf36d4052bd0c948e05bbf3b0cd0da8684ac00e SHA256 41e8b9c1af077544625e8b398582f101dacc3b8457fee1811a724ca4245ab227
-EBUILD libssh-0.5.1.ebuild 1900 RMD160 818c7719ce8cd4001df456c24f38662f69b87540 SHA1 97a7200a1d1c0a1ad3af21c41e113e52e3a4f4e4 SHA256 a132a21479b354f0b8804eb8cace0265df785b2615150e1cf474a09e536c5aae
-EBUILD libssh-0.5.2.ebuild 1910 RMD160 d38513370dff61b5e7e4e341a261d5dbb6d6798b SHA1 1ce5cc077c95732a3dbdc5cd016049e8ff371e1d SHA256 bcfa1da99726f5df127b8d70b6c5809d777d5bfe1228b4e3df43ba1b26b66d9b
-EBUILD libssh-9999.ebuild 1476 RMD160 621b94791a2be1585871e68685ba59fae4bfe987 SHA1 add26fc157d81f50aff2d33f8f01a308da9e490b SHA256 f7de35a5de94e8fbf7df009e4a03d361bc8f748cdde9accae8ecad73018943f3
-MISC ChangeLog 8751 RMD160 5b061e93affbd62cb34d9921147f585961671ce6 SHA1 f45b205fad237e70301ba3cefa0ea685e3728fbf SHA256 2a9e38c7ce462ecf2a9a5f5658da919545cdd2bac328d633b4ae71572f392dda
-MISC metadata.xml 617 RMD160 62c9a2d4ef7d2d96b7d92d991955fabd7e852938 SHA1 3a3043b5b0684bb959008f0107957841cee6b4cb SHA256 cad0b9d4d822716fa2a55fde2b79b85456b83a555a07161190d3ad48400cae8c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX libssh-0.5.0-no-pdf-doc.patch 1195 SHA256 116f436073bb6eed8ec776828efcba399852019483a10da2691b3d350570c793 SHA512 739230d6bde39ffc09d054cfe54d5182aa2ccafaae50d8e9f803321de5c295b9eff653cd51d22b6112db39538f4f02d0231c9fdbab76afe7258d9d4ec4004e34 WHIRLPOOL e540d0e1ecb5f5122572b99982780a19559d69ce147ec41e6d70e78504d2297ff03381eec898a53ae61ba65178da4b93bbfd486cbd486543ec5126da86eb75e5
+AUX libssh-0.5.0-tests.patch 473 SHA256 aa57848a7e67fe4e62bad6ade2dbeb45c616b03f9d38594ac90deba893c649c1 SHA512 28c1675db83cfbb8534c8108ad7c6a535bf2c168907c1e73c84cd04f4912e9101f68543cba301302f4cda8b30d1b71a72275ccbe811da98db4667b0eebe468c3 WHIRLPOOL 5c89e7cd0e2d9cefb1f87f70347b7ddebd381e1967bc20352bc01d607f84d2afcb69af42f80f1f64fa5cf87c73237e62e8b4b129b6ae95158679a5e972cb9070
+DIST libssh-0.5.2.tar.gz 317336 SHA256 41e8b9c1af077544625e8b398582f101dacc3b8457fee1811a724ca4245ab227
+EBUILD libssh-0.5.2.ebuild 1912 SHA256 c01fc4e115ce698f9f939030045b0ca786b817fe40f031c22188f00d4492e472 SHA512 594f43652c0ce7472633e1b2dbd717b779ed06284b57c378e6cef56c58aeb59cd4c66b01e2a6df3e25b7dfac225ecc2f9a3b43ca200e59f53a0266bca5346db7 WHIRLPOOL 86218826477513587a7084f435c17d72a306b70b278fc2e717849970ee3cb25c15bacc01f610e7be05fdc00b908b74afd52a160d62f2e3ca35198b258451d1bf
+EBUILD libssh-9999.ebuild 1476 SHA256 f7de35a5de94e8fbf7df009e4a03d361bc8f748cdde9accae8ecad73018943f3 SHA512 a3d0afa59d38dd8046f7b6875c0ec6e9409c735998a1effae5565a7d7ba1f24433f34cd5312afad944eca0314e84543f576c72665d2eb460853e67acc9987751 WHIRLPOOL 1ba2a7fe52340a33d977950fe8caa8505cbd840138486a659d3ade186a873f34f0dc422bbfe88ef259624e9b096ffb005f5e259b4b090bb385e8a10d05d62310
+MISC ChangeLog 8903 SHA256 e8b6f4ae9d826fe2d8d42a9489fcfa08b26d7f06ff6ca44004a8b7ede0db9c74 SHA512 8dcca0c6ddb81bd4a19fb8c749fa4282bbe514861cdccd34d20e5341d92ed4d26e91b735d0f1014422ff24b97ee60a7d2a62091e4c62c047d86ccf5d3ad64383 WHIRLPOOL c3bd936927052bedbf04da78a1a9f5f972f713d2444d88d1ac14f18edd146f866e39706e2209bc57ab8d7662beee063ffb4aebcaa3e6929b78f8865e3718e5a4
+MISC metadata.xml 617 SHA256 cad0b9d4d822716fa2a55fde2b79b85456b83a555a07161190d3ad48400cae8c SHA512 8a7c2845fd7e4df29b9d7468068f0deea329e23c03aecd10ab3a4c23674cd18a6eba8ccdf45d183388ba1ebf81223f5b0113a0482db405d07204bc094dff3504 WHIRLPOOL b32090dfe53609491430204c81f8150685442c257b0611a95db11f219cd2fe67695edd5093141ce0668ef3b28628e3c537d3e6c44a17add300ccf2cfa6068e17
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQWwLyAAoJEOSiRoyO7jvo6e4P/RLSM//bYTYWvDkP2sHvFQWV
+QixrgRY73QoSBzuJ3/g3deDJEY2PH5INBsKPiR6nm3ToG5pgfOI7m34/06zlUORu
+FNoEQdbRCt8EAs4USC1rKia8Gpg3gHV1rD6nfFGONAL/uvFvE/VPP280dkCPEKqW
+elFgnlvJIT04u+OWJKmO2mBvOUZyd+chS9jXGYe+f2s+H0Cwr2r48Hd1hEQ6Mqb+
+PN73uYixgurJAiUvGuIHCYjisMlvbw9F2giqFv6WcQCn/hzQZAyaZBuEyhIOskG3
+hWIOq9Fi1wdNqAexsOdvR6HRfHFDi+nx422I2xo6e8r1BdhS188d31YpyAqGp69U
+tiQRZMpQWs/AoPCrXS/AUOqYgLYZ7BLqNcY1DanPCQO2KYI/TkH63OFRmNGbBBdR
+3AelXuT94PzUZ1BNaUKxR5GO2tvXXNnIphC4l91rglMcNsVvX0GwUn+bNCjgtjY+
+PqeklLQ8bkARg31hRVG4/6Ko0Beyu6eHpejk+hE2JfD+8dCGw0eTEqyO6w0O35Nj
+ed3tpAsH30gwi4FBb13uB4nL0EAKSg9fqkg+e2HWluEUO1q508NmBjrD+l123z3W
+HRfxY/HBY8Pvg9D0pJ6mnBePaycn/9Zrlpg3fnCcBxzl92O5s6qacg7x5h1qfG9C
+CmyeLElCa5hGFY5onZ7C
+=ty42
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libssh/libssh-0.5.1.ebuild b/net-libs/libssh/libssh-0.5.1.ebuild
deleted file mode 100644
index 6270fb434e76..000000000000
--- a/net-libs/libssh/libssh-0.5.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.5.1.ebuild,v 1.7 2012/05/20 08:19:54 halcy0n Exp $
-
-EAPI=4
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="http://www.${PN}.org/files/${PV:0:3}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="debug doc examples gcrypt 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 )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cmockery )
-"
-
-REQUIRED_USE="test? ( static-libs )"
-
-DOCS=( AUTHORS README ChangeLog )
-
-src_prepare() {
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-
-	epatch "${FILESDIR}"/${PN}-0.5.0-no-pdf-doc.patch \
-		"${FILESDIR}"/${PN}-0.5.0-tests.patch
-}
-
-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 test TESTING)
-		$(cmake-utils_use_with zlib LIBZ)
-	)
-
-	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/*
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.5.2.ebuild b/net-libs/libssh/libssh-0.5.2.ebuild
index 54807bcd45f0..d6369c22337a 100644
--- a/net-libs/libssh/libssh-0.5.2.ebuild
+++ b/net-libs/libssh/libssh-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.5.2.ebuild,v 1.4 2012/06/07 22:00:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.5.2.ebuild,v 1.5 2012/09/20 11:49:34 scarabeus Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.libssh.org/"
 SRC_URI="https://red.libssh.org/attachments/download/27/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="debug doc examples gcrypt pcap +sftp ssh1 server static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake