Version bump.

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

4 files changed, 71 insertions, 9 deletions

diff --git a/net-libs/libssh2/ChangeLog b/net-libs/libssh2/ChangeLog
index 16b274088452..f1d815edc4e3 100644
--- a/net-libs/libssh2/ChangeLog
+++ b/net-libs/libssh2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libssh2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.62 2012/05/10 21:46:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.63 2012/05/20 06:47:42 radhermit Exp $
+
+*libssh2-1.4.2 (20 May 2012)
+
+  20 May 2012; Tim Harder <radhermit@gentoo.org> +libssh2-1.4.2.ebuild,
+  +files/libssh2-1.4.2-pkgconfig.patch:
+  Version bump.
 
   10 May 2012; Tim Harder <radhermit@gentoo.org> -libssh2-1.3.0.ebuild:
   Remove old.
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index e916003a9c36..6aebfb7d0984 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA512
 
 AUX libssh2-1.4.0-pkgconfig.patch 308 RMD160 c2af8bc527d273782b53d2165d8882b86f4664ed SHA1 090615d87a34360ae05c4b19c56528938e1b9772 SHA256 365fd718809a40b7339903a1adbc7f235c2d85afc77629b370c10ffdffa7b5aa
+AUX libssh2-1.4.2-pkgconfig.patch 312 RMD160 6f2af60fde6c7f13feb8b9dff55cbe7ecd58ee9c SHA1 402ca06a9cc2497d9d36dc37a0ec06f96aa17c22 SHA256 829134a808f51310ab098ec5d20d15683015161635a3deca993f259d2675a5eb
 DIST libssh2-1.4.0.tar.gz 653514 RMD160 36f1a8fbc0a805552aa8db59ac906e837abf8f9b SHA1 53428b4935ab6eb843d45f1593dc434cb287b93e SHA256 dfc5bbad14a5049fea5c5e8a7a743130bb1e365730e13e2bb7d6494c92a4c581
 DIST libssh2-1.4.1.tar.gz 658507 RMD160 d2d705a3a3264293c25c141750edb0c30171b792 SHA1 a5c59eac66f5686f3960f59dcb54b5bf3b339811 SHA256 196579273b47813fe833d35dd234767567ed8938d9b98f1badf7af9002c9322d
+DIST libssh2-1.4.2.tar.gz 679992 RMD160 7c7dcfa559a0add58c82f97f19a188576e40b67f SHA1 7fc084254dabe14a9bc90fa3d569faa7ee943e19 SHA256 418c09061fb9c3c26fec391a35a062780b21b3199885e3b27054619582469bd3
 EBUILD libssh2-1.4.0.ebuild 1058 RMD160 5662efbbcfe83b55d63591887ee2b54e52e98248 SHA1 0d6f0f6c212c963de570264c9ae4819b8b7af066 SHA256 1c7419236761858c1fa897ce62de956d31d86c8c0f6ebf32024bb5daea8ca72a
 EBUILD libssh2-1.4.1.ebuild 1089 RMD160 097b1298317dbea9b72833d7ec5a274c10e42ab9 SHA1 3fb7fe8a90d6b5f09d38e62cbca28517ee31c797 SHA256 d76def8a5ceb807632c6714ba138d18860ddc1c205343fd8658280ad0980dc25
-MISC ChangeLog 7933 RMD160 c1e29ef4fd08292c073da022b1c746b9f0e2ca11 SHA1 166c6ca45fd952df091b872107059e192df57c18 SHA256 d9dae14a3acfe582b554a132c2f38e20d7de190672acdcb43aa429ad4a89228f
+EBUILD libssh2-1.4.2.ebuild 1083 RMD160 edf7f3a69de847b405a345b46a200d1eb528c663 SHA1 5d4d28dd244ad84dfbdbaf0158d92b47ef70c468 SHA256 a763c67ae5b71d4a6ef7d836d44bf8c9d56337ecb455123e7c4df5d811f9df93
+MISC ChangeLog 8092 RMD160 9e5aa48abecdc04e0efc4b0a2c40f06ba3a200cd SHA1 a1a588f36525c655a298f007f6cca268de0af809 SHA256 5ed8d682613fc782f14952698aee1c7312ce0b4ecad3660a6ec7290d137f4eac
 MISC metadata.xml 254 RMD160 999b0e56d48f4d85cef9cd4560ee0d251581421b SHA1 73eb56da4bf79beda2ad262cd42a41ba2c21bb66 SHA256 776a37a5fdfe9fc7935617b72ec8def2a97350c40c658ee8dafe14b5dbf2633b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPrDddAAoJEEqz6FtPBkyjqjYH/11YsA0sfPFDUgMsruwbOHIu
-L9zGWxCFhFsD1cFIvbkvDA2zgKH5/qe9IWAhtTy85aRJ4xwdupkHsO62k07HhTyc
-xMZlrI8UUq97n8kAabdsBKpzkkYvUnTiGfktpV83JgmUQuCCVhM1/uhm4YDYcVFx
-CsUZWVjsKF/dzonLvnXgTsXBQb1aZ79RXBRK4UwQzSyUTMw1Obya/mBbVePDRQgL
-l2At5sJsigQvgFY1C/1PbICirxF53OPY2Hva2zAyOWntzlifujOy8ERxjAxL9/vU
-D3txgnHArQ0TZgVkVrev7pTzbVeWdUqpAIqMy7ACYNya1J5R4RyS5QR2gFPrm+M=
-=XLlW
+iQEcBAEBCgAGBQJPuJObAAoJEEqz6FtPBkyjneAH/ia92YFdEgkNxv+adPI6EpZ4
+53KbllwgTCgz8Hp1B7swbr16eGOTJL8KX47Qx3ExmKnBPQyUdRRNpksiefy4ye9+
+IvzF7DqhotIQDQnWRT1TQ/GKZHfq4wOdSHo7Rp6/MNiHogc6n3wHD8RhyJNxEqHo
+xZtj45S70komXRKj8N7zpeQJ+Nk4oq1OesixTfl5aHpgy45auCVsKZC36y1bItPe
+GYtxMsD9WacJA64cYaTK3a/I7tETh+3r3LUTbHC7+7Xje234a5GoWB0f+etleQ8S
+Qo6a/Tpuq8cwo1rwF/0kXzDJFo+HM3fv+FXJuyC+mWxfdY+xyE+k4Y0AP8kdrOY=
+=lNqP
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch b/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch
new file mode 100644
index 000000000000..813e045da625
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- libssh2-1.4.2/libssh2.pc.in
++++ libssh2-1.4.2/libssh2.pc.in
+@@ -12,6 +12,6 @@
+ Description: Library for SSH-based communication
+ Version: @LIBSSH2VER@
+ Requires.private: @LIBSREQUIRED@
+-Libs: -L${libdir} -lssh2 @LDFLAGS@ @LIBS@
++Libs: -L${libdir} -lssh2 @LIBS@
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}
diff --git a/net-libs/libssh2/libssh2-1.4.2.ebuild b/net-libs/libssh2/libssh2-1.4.2.ebuild
new file mode 100644
index 000000000000..d263f1388340
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.4.2.ebuild,v 1.1 2012/05/20 06:47:42 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 ~amd64-fbsd ~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}"
+
+DOCS=( README )
+
+PATCHES=( "${FILESDIR}"/${P}-pkgconfig.patch )
+
+src_configure() {
+	local myeconfargs
+
+	if use gcrypt; then
+		myeconfargs+=" --with-libgcrypt"
+	else
+		myeconfargs+=" --with-openssl"
+	fi
+
+	# Disable tests that require extra permissions (bug #333319)
+	use test && export ac_cv_path_SSHD=
+
+	myeconfargs+=(
+		$(use_with zlib libz)
+	)
+	autotools-utils_src_configure
+}