From: Jeroen Roovers <jer@gentoo.org>
Date: Wed, 26 May 2010 17:12:09 +0000 (+0000)
Subject: Version bump thanks to Emmanuel Andry (bug #321567).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=56fbeff0c6744ff89e24664f051e3b44f0767d06;p=gentoo.git

Version bump thanks to Emmanuel Andry (bug #321567).
Package-Manager: portage-2.2_rc67/cvs/Linux i686
---

diff --git a/net-libs/libssh2/ChangeLog b/net-libs/libssh2/ChangeLog
index 9aa5fc37570d..1203ccee1592 100644
--- a/net-libs/libssh2/ChangeLog
+++ b/net-libs/libssh2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libssh2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.31 2010/03/28 17:57:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.32 2010/05/26 17:12:09 jer Exp $
+
+*libssh2-1.2.5 (26 May 2010)
+
+  26 May 2010; Jeroen Roovers <jer@gentoo.org> +libssh2-1.2.5.ebuild:
+  Version bump thanks to Emmanuel Andry (bug #321567).
 
   28 Mar 2010; Raúl Porcel <armin76@gentoo.org> libssh2-1.2.2.ebuild:
   alpha/ia64/s390/sh stable wrt #298456
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 12a60eaefd5d..7506bc85e02e 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,4 +1,6 @@
 DIST libssh2-1.2.2.tar.gz 535430 RMD160 21e90f957019c11d0447352c5ac19c9dc3f8dd5c SHA1 d1a52cd4949efc7befcd61052de7fce4ae3e7415 SHA256 1e2a133b111a367c579b89d72d5da9e65a73b8e57202b91d540a51141aca69aa
+DIST libssh2-1.2.5.tar.gz 559553 RMD160 c6a50dfab2c618b3f9928288fe0c78b0004ff723 SHA1 816c8b4206bc798eb540411509d552708a1cf6f3 SHA256 9ff3d11a8d3d6c49ea6746cdb6a482473df0b758a81bc81cffcc5449db3d9c42
 EBUILD libssh2-1.2.2.ebuild 1091 RMD160 0487e598c61c5b577ec20d3f3908e445923f815a SHA1 2599cb3ee32197dcfd4a665ea5c7b95cc0ece34e SHA256 fa0974fd9a9f7cc951d0bcfe3b8f025569a2cf4f5a58dc2031b5f2d948145e2c
-MISC ChangeLog 4087 RMD160 7b92bf88a85f6c75bbbf2d02d9d0c1446a434d96 SHA1 3efc8d2bef79cb3fc452b14459be7ce6632eb518 SHA256 808f17b57c41fd5c7840f84130e1cc9bb9f56b64c56ce87f1f4936d1e0748132
+EBUILD libssh2-1.2.5.ebuild 1098 RMD160 83934332e10368d5d1b75cdfc8e3659d8b385350 SHA1 7af76f56637b7a1f7c6309cf12588ed3d9d42d75 SHA256 77be3106b612477e1c930ad6aac9bf5ac3017927a1ffb0085a8f29357cb692be
+MISC ChangeLog 4239 RMD160 aeef53a911d9b59e201f87aef001d73a0c180e76 SHA1 99afbf44d32f695a5112510d24439b18b7831539 SHA256 45d35f59f38c1bb8885c962fd15c10bfb0264756ea2cf607e2ccd54fac138e87
 MISC metadata.xml 254 RMD160 999b0e56d48f4d85cef9cd4560ee0d251581421b SHA1 73eb56da4bf79beda2ad262cd42a41ba2c21bb66 SHA256 776a37a5fdfe9fc7935617b72ec8def2a97350c40c658ee8dafe14b5dbf2633b
diff --git a/net-libs/libssh2/libssh2-1.2.5.ebuild b/net-libs/libssh2/libssh2-1.2.5.ebuild
new file mode 100644
index 000000000000..a1664ae629b5
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.2.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.2.5.ebuild,v 1.1 2010/05/26 17:12:09 jer Exp $
+
+EAPI="2"
+
+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"
+IUSE="gcrypt 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
+
+	econf \
+		$(use_with zlib libz) \
+		${myconf}
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]]; then #286741
+		ewarn "Some tests require real user that is allowed to login."
+		ewarn "ssh2.sh test disabled."
+		sed -e 's:ssh2.sh::' -i tests/Makefile
+	fi
+	emake check || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README
+}