Version bump (bug #542914).

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

4 files changed, 60 insertions, 20 deletions

diff --git a/net-libs/libssh2/ChangeLog b/net-libs/libssh2/ChangeLog
index 1d86ed1323a4..b79a9ab02b9c 100644
--- a/net-libs/libssh2/ChangeLog
+++ b/net-libs/libssh2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libssh2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.94 2015/03/02 09:30:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.95 2015/03/12 09:17:01 jer Exp $
+
+*libssh2-1.5.0 (12 Mar 2015)
+
+  12 Mar 2015; Jeroen Roovers <jer@gentoo.org> +libssh2-1.5.0.ebuild,
+  metadata.xml:
+  Version bump (bug #542914).
 
   02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> libssh2-1.4.3-r1.ebuild:
   Stable for ppc, wrt bug #526056
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index d3aecaf217de..21efe2a2d8ca 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -3,24 +3,16 @@ Hash: SHA256
 
 AUX libssh2-1.4.2-pkgconfig.patch 288 SHA256 0a4fde85a0772a6ecc793493c19f58416847ca30135f64e7e0c08a3197ea2abe SHA512 a2a29069a85fd1e1fabe0fac92ea5666a82da53bf822e105ff0b918188196bdbdf271e2b7a8e636b9746fb75226192c0bdd8a0f4598e46604a64b6f0727fbfec WHIRLPOOL c59b318376ebe979aca73721b4be23374f6d2f44533044d689f94ad145d2b70acbf584a3c6e1a4bcf57805a350259603204ec140b8388d98bc1fcbad94f3f1c6
 DIST libssh2-1.4.3.tar.gz 685712 SHA256 eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d SHA512 707e0634b74fcf0f5ae4e46d9807907db7cd09328d553a67c49e9e11d852ae85843a7dcbe3f002e639eb2704e53e865c640c8fe85dcada330d0160708e8b5177 WHIRLPOOL 19e01f3854cd8696c4478da136918d2f4fe0efb9b3d4f01830e235e4395c25ec597ae769db2129036e28d7d42fe0104fe8dfec54bf3ef04a5c09aa21c4fdc7b3
+DIST libssh2-1.5.0.tar.gz 728222 SHA256 83196badd6868f5b926bdac8017a6f90fb8a90b16652d3bf02df0330d573d0fc SHA512 9dada6d86e962ce35d6d30625d3a8743b5f269b325d4f1e072206e73c4ef87f216fe54c0c5bfc06eb969a07e221c21ce6f7b9e5524afdb3f957a25f714c62f73 WHIRLPOOL 94e897f59a02ca7ab4b3006cc9c84228a202f16a8e898f202e89015275e95324cb7a71c722324134f1b7f5a85a45718a2c7d25de1d806e0534c1d61683da5487
 EBUILD libssh2-1.4.3-r1.ebuild 1287 SHA256 f86679da2cd710b8989a229d5cf366f723885d55fc5bcf0cb8da79cee5258061 SHA512 d38169f762b2c1d1f72a54b2e9d0bf8ab1275cc0c2d1e81e86bb8b3f5d5f785141233f1ff679fa9ae54cb161695b7170c7789edc9abc5ca91f71383e2f5064a6 WHIRLPOOL 2cec49aea96c3233cce4011ce6a274193fa22bfe4f8185c13c45bf53952674bd94d9783470c17d718b016e765b990d0ecce780ca3323669f6aefecf7cffdecaf
 EBUILD libssh2-1.4.3.ebuild 1049 SHA256 68da990fd7173d268817947a6d492b88f0c7e1a6a1c6b0b90e0cbb8b39ea85cd SHA512 1611f38415d60aff8e04a8142edb760490c7a79054a87deb20254adf3bca6eb8dd5f4e2ecdded8e2b4f7a15268f8c39d578ccde157a79a931b7614ae1caaf881 WHIRLPOOL e29b67ef22755ee4413893b622dbfe470a153991ce81f7197279feed0a10176a61483c32fba3aab0dcbdfea80b4d43ca931da833e296f4d8cc946396131e5a5c
-MISC ChangeLog 11662 SHA256 468fe3d6a3b66a92a176166c09271c60223c8c30e3a2434614763e268fbed284 SHA512 653887f2dae9369444ce314bce2e5a15959feb05c07b003b247bd56557970407a3ece5e6de5738adb278c0c9bd22a50fa3685c3319ad9ece8e58c11b358a5e0c WHIRLPOOL 70e682da6eb52abe2d7bd5cfbaf25c708d0c769a0a03adcb26253646ef929c2e698c74d78c3dd962d1069f4ff4468b2210bebbb3c03f8228f69bf78acd1200b9
-MISC metadata.xml 249 SHA256 68839e8bf40ac510d514eef43e29e2050ca1145fc9bb538e2f289cffa9218fbc SHA512 0942479ade23fb7bc1f0df27fe5378390d0c140a3aca09f41c9e142b8b61551c787a67fb80f4ed31321616e334a1f75ee416fc81a4630e64d84c7f0f9c594195 WHIRLPOOL a9c005e1f4d1276d516cc318363fb23b75cfbeb256e92a62ab7fda6b18d333a3cd7f82548e242c8b9b4c65e07b7723bde7211697b6f3532690bcad0c0890effc
+EBUILD libssh2-1.5.0.ebuild 1291 SHA256 776579b0c8fec4e6e248ab1ff2ea0749cc09c2e9b45f99d633024fbfc1e5f082 SHA512 407f4520cda80700e63e6b1a59f129d2856bb17c6565b6e01440f558ff6a0a25bd0f05a827936b067eecc95565df42d45901317352364edfd17a9b3c86bcf7e3 WHIRLPOOL 76ea2181ecb95115391176603bcac5ae54a83fb9d97c365b3a7e596287e765f55459f180c3cd6693f13784cbd71bb6dea1c9c80264f7758367fa2451ffb89057
+MISC ChangeLog 11809 SHA256 84593825530d4f7848e4976702ebf0f765780335ea093bcc844c607158ed7285 SHA512 ead83bef4d43428379e029fce84bd3f519b72d2c423c58bb4015bb2e6016e8cadbb474174d5ecdbd02827fdc826c433d39d9862f003b046f1a15cb3d8664174d WHIRLPOOL 1640d700f1bb8252af9e1e7696566fd2c8a062a88e6b7899f550dffe74c7b8b9800d5daa5ed444175f1b3628b59f54b248e7680e99f5c49e2053e39d4ce35684
+MISC metadata.xml 272 SHA256 4c07d4717c27b5976aac9ce277542bedc24b5bef17f3cb4c7927fdc24d0fd709 SHA512 7a616c601fc9c21e3c6f96090a84a0c9165751ff67c7df5f22a6a481732a38fc9eaf591c7250f777bd4f7fbf62bdf10cd71f744be4ceb89f33844dc00b63a5aa WHIRLPOOL 08dfebac6c76e121aebce82c9cd160a76481c008a3fb76032a22216d90644279d5af7b02e0fed005d43381e8c1344b5e7edb52a61c060295aaba05787ae2af37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU9C2ZAAoJELp701BxlEWfjYEQAK4YdOu62jfQcBkmRuhPz2UZ
-wb8TyYJHaHara5yAP+HGwHQy9GqL1gE4Fy6aKJt+QyNz1gh1HpLbsXJ47n6/+fMZ
-mhxSVz6/xFZnxIVybtVult/5AbRB1GQ/S1zt6Kb5YGFeZZ44UXfdmSe8rSn0iJNl
-oPYLhAPwZFOZkCaMnI4QjePvmCmow7EvsnehuraYaEdLUwEyJyG3ybUSoUOOtCsu
-np/uAlMJPG+67KEfmy7ewudRj8X6AG9t5TiK5C1/kU7xOGMC2cfG5AZ9B7cXuIn7
-45UeNg63/8Q3qVNtKyzlMEBiliKC7j58TDoIstn8Vmtd/Ie/yCdA66qCxT9eq+Ss
-W+sErANldbMi7jQn5+BVia6LotCP+w249Muphq7qEXbshFAbDDGfp5h9kTrazlZN
-nOxP18o/uH3hUs5i1w66bzkrJJDzdNMuL8mkcmztwpR4L9SYCGQBl7cVwV25WEWA
-Evu1eP/YCWyd0x6rshv/QbHL50K11dimw5nbsIwr4rifVrCItFczHpLoYZbZoW+W
-Dwc9cSrMOUOiV6s1Q7bGn4ATDkIMVbWkcXIAxphKnLBGiaQAjDDmmSFCQQQRv1qH
-kxu54L6bP1MfywDrqI28UEpf0RqOMdF5okIMrrz35yLM/ih/lMRXvjtYdHmW2y1B
-As/uQuo+xec1FQ4a9r+Z
-=GCDP
+iEYEAREIAAYFAlUBWY4ACgkQVWmRsqeSphOdPACdGHOmdq02MA2fNKZAY34057gS
+3hUAnjW8MfGqZODwQOVxsGzhqAuKbfuL
+=aQRj
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libssh2/libssh2-1.5.0.ebuild b/net-libs/libssh2/libssh2-1.5.0.ebuild
new file mode 100644
index 000000000000..8d49391aa96b
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.5.0.ebuild,v 1.1 2015/03/12 09:17:01 jer Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+inherit autotools-multilib
+
+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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="gcrypt static-libs test zlib"
+
+DEPEND="!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+DOCS=( README )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.2-pkgconfig.patch )
+
+src_prepare() {
+	sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	# Disable tests that require extra permissions (bug #333319)
+	use test && local -x ac_cv_path_SSHD=
+
+	local myeconfargs=(
+		$(use_with zlib libz)
+		$(usex gcrypt --with-libgcrypt --with-openssl)
+	)
+	autotools-utils_src_configure
+}
diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml
index 7bfcc3b0e669..1644999aaaaa 100644
--- a/net-libs/libssh2/metadata.xml
+++ b/net-libs/libssh2/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<use>
-		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for crypto</flag>
-	</use>
+<herd>netmon</herd>
+<use>
+<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag>
+</use>
 </pkgmetadata>