Version bump. Add workaround for failing tests (bug #333319).

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

diff --git a/net-libs/libssh2/ChangeLog b/net-libs/libssh2/ChangeLog
index 88b5821f8601749d3e886618aaed4be39bb9a429..33557ecac1cd4e5db5a31d6da6f13138fe84d3ca 100644 (file)
--- a/net-libs/libssh2/ChangeLog
+++ b/net-libs/libssh2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libssh2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.38 2011/08/20 23:04:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.39 2011/09/21 05:37:50 radhermit Exp $
+
+*libssh2-1.3.0 (21 Sep 2011)
+
+  21 Sep 2011; Tim Harder <radhermit@gentoo.org> +libssh2-1.3.0.ebuild:
+  Version bump. Add workaround for failing tests (bug #333319).
 
 *libssh2-1.2.9 (20 Aug 2011)
 

diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 9607d24149f49e2c7a5e72e7f858c04164165b47..d7c4d0863103227f64d571bdd1e66675f459b548 100644 (file)
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX libssh2-1.2.8-version.patch 1220 RMD160 9997080d124edb7f3188a6b78753efbde69adc94 SHA1 8637c83faa2c479128414ab4c05fa90a10dc5ec9 SHA256 f19a91aa8121bfbf37f43b8f68780206c19d786db97c7f5023742cefc6d5dbf1
 DIST libssh2-1.2.2.tar.gz 535430 RMD160 21e90f957019c11d0447352c5ac19c9dc3f8dd5c SHA1 d1a52cd4949efc7befcd61052de7fce4ae3e7415 SHA256 1e2a133b111a367c579b89d72d5da9e65a73b8e57202b91d540a51141aca69aa
@@ -8,18 +8,24 @@ DIST libssh2-1.2.6.tar.gz 579590 RMD160 939faf85e4ad29b99793224c88561c52f15cd731
 DIST libssh2-1.2.7.tar.gz 583105 RMD160 cb438958a77df0e194ac83499dfdd78ff4524b0b SHA1 271dd411015cd3656886541c6650a4471458669e SHA256 6815207498b42c538b2c85750e6cc94e7e210703aa1120cf5546b4aa88cdc68b
 DIST libssh2-1.2.8.tar.gz 637707 RMD160 2ca609d73febf2ec079d40538c9d3a41449be8f4 SHA1 c3c54ae5f8e8d145dfa25f6e437ee1a29523c84d SHA256 adc6f7de1e50c3ac369931b67d69a937a7c8c1f362df6b0a84667fbbd91c403d
 DIST libssh2-1.2.9.tar.gz 642150 RMD160 b7aa7c7a66ae82433dd165d5c00c005786b29d45 SHA1 a0557049c8ba9d9db6bd513e2acc29f53295c5e7 SHA256 fc05ef82ce05562b7ba6483098aae99b3d1dd1522c478d76ff7547859d6bd664
+DIST libssh2-1.3.0.tar.gz 639262 RMD160 5c8f0cfde6fb4378eb0985f6ecc090061329a133 SHA1 d342e06abe38a29b1bbb9c58d50dd093eab0bee9 SHA256 9de377854202f033bfb57ce4f95194a2b1283d45fb243b5e7dca30e058f40f9c
 EBUILD libssh2-1.2.2.ebuild 1091 RMD160 0487e598c61c5b577ec20d3f3908e445923f815a SHA1 2599cb3ee32197dcfd4a665ea5c7b95cc0ece34e SHA256 fa0974fd9a9f7cc951d0bcfe3b8f025569a2cf4f5a58dc2031b5f2d948145e2c
 EBUILD libssh2-1.2.5.ebuild 1098 RMD160 83934332e10368d5d1b75cdfc8e3659d8b385350 SHA1 7af76f56637b7a1f7c6309cf12588ed3d9d42d75 SHA256 77be3106b612477e1c930ad6aac9bf5ac3017927a1ffb0085a8f29357cb692be
 EBUILD libssh2-1.2.6.ebuild 1126 RMD160 cd9a967b2e3179f8ca8eb5d2b31db0951d16161b SHA1 39eb84ba2cd427a60e4de531a0ca51a8ec270eb3 SHA256 60457fb0afc2bd32f82b54ad597a01f3660022381ead547c7d840919e5e0f72b
 EBUILD libssh2-1.2.7.ebuild 1122 RMD160 efd41c838e6663cc13e22b159371253a9c4c6479 SHA1 ac70d14f0cc720d5d7cd6269a6aa1bb1d95bf592 SHA256 0b94614dedeff29e64c6526cf9e7656f473037cc9d8fafa5622edc8bbb52f034
 EBUILD libssh2-1.2.8-r1.ebuild 1320 RMD160 8c1058a17983a45c879c5a302a26b07cbb5cde7a SHA1 906df2379ee897150be7ccdffd1e425258b27d3b SHA256 f8c8874b26051675559f870496bc6d427960606d1f3ce9acd960d8108f796657
 EBUILD libssh2-1.2.9.ebuild 1186 RMD160 8210eb213b8388510c254c46c85fb50f7bba3bec SHA1 a6ba3b6d2500c6b02e5bea2238811a74afd33c13 SHA256 4faac04942bbf88392761678d4d84398d73e1cf4ff8fe07bd7634f0929fcc3f8
-MISC ChangeLog 5141 RMD160 cd4f42fae1cea0ae0aeeccdd3606358acefee556 SHA1 bedd912b556ca2b18331a98ff541641d318698ac SHA256 9dcb87de266afecfd5aafc80d24589aa32b106b7059f717eb5f2580c7a907afa
+EBUILD libssh2-1.3.0.ebuild 1080 RMD160 5260b8611d072a68c6f1b9e468f5ed53623ecb2f SHA1 a771c3cf3ebec591131f516e03ccfdf2c28527f8 SHA256 b9f612e7425cfc061130c46216a7945f0eb375f6fad80614d514cae6291849d8
+MISC ChangeLog 5314 RMD160 36c8aedbaa82b64e6b70cdfd4d583aef5762df61 SHA1 bda9ff4428aea8b64b2ba65100982375ace4a639 SHA256 ba448295730f7d8c8601f9e9861010521ea8225541432cf5b8e3b3579850a61a
 MISC metadata.xml 254 RMD160 999b0e56d48f4d85cef9cd4560ee0d251581421b SHA1 73eb56da4bf79beda2ad262cd42a41ba2c21bb66 SHA256 776a37a5fdfe9fc7935617b72ec8def2a97350c40c658ee8dafe14b5dbf2633b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5QPZIACgkQVWmRsqeSphNI7ACggS3cj979siyuw3hO8g//HSJm
-5roAnRuE9BqIMLLGDjgRrQ8LlMywuhsX
-=fTCD
+iQEcBAEBCgAGBQJOeXg0AAoJEEqz6FtPBkyj+hEH/2a4JSzYWOZ2a4liDvyoQpa0
+7nIxhGXHhSEcta5erGdnqm5/TtmL7Y8j+hbdi/33bBsdRpo/aRNL2gAszX7VHY9R
+8+v2holIvaL4anoVER2ppel2hBhGSaRYtk4UuHY2KhZ/vecuPBJAzEZAk4KK/REh
+zzA5oSXLMgoRgDbJKCNGBOmfsjB33Ace8guesDrcZSYneVJlQg0F+/p+BzRW3ov9
+4gvlMcj6sHDNOkDGCSVnQYvrPYhb+7A4f1bXqW2dVyZX1aCgsARMgqKgr6qA1EgL
+fP8GwzwRq7XKNckACE6CAgroQmVLty+RlyI4+McOomHRbyFf0Auf5CNYMZ9xigo=
+=SSlw
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libssh2/libssh2-1.3.0.ebuild b/net-libs/libssh2/libssh2-1.3.0.ebuild
new file mode 100644 (file)
index 0000000..6cdc3f7
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.3.0.ebuild,v 1.1 2011/09/21 05:37:50 radhermit Exp $
+
+EAPI="4"
+
+inherit autotools-utils
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="http://www.libssh2.org/"
+SRC_URI="http://www.${PN}.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos ~x86-solaris"
+IUSE="gcrypt static-libs test zlib"
+
+DEPEND="!gcrypt? ( dev-libs/openssl )
+       gcrypt? ( dev-libs/libgcrypt )
+       zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+       local myconf
+
+       if use gcrypt; then
+               myconf="--with-libgcrypt"
+       else
+               myconf="--with-openssl"
+       fi
+
+       # Disable tests that require extra permissions (bug #333319)
+       use test && export ac_cv_path_SSHD=
+
+       econf \
+               $(use_with zlib libz) \
+               $(use_enable static-libs static) \
+               ${myconf}
+}
+
+src_install() {
+       default
+       dodoc README
+       use static-libs || remove_libtool_files
+}