Clean up patch.

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

4 files changed, 12 insertions, 65 deletions

diff --git a/net-libs/libssh2/ChangeLog b/net-libs/libssh2/ChangeLog
index 85bf80accdb1..49cd2f548ae4 100644
--- a/net-libs/libssh2/ChangeLog
+++ b/net-libs/libssh2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libssh2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.86 2014/06/18 20:38:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.87 2014/07/18 15:38:02 jer Exp $
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> -libssh2-1.4.2.ebuild,
+  files/libssh2-1.4.2-pkgconfig.patch:
+  Clean up patch.
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> libssh2-1.4.3-r1.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 29cb3aaa2a85..3c8cb0003492 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,30 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libssh2-1.4.2-pkgconfig.patch 312 SHA256 829134a808f51310ab098ec5d20d15683015161635a3deca993f259d2675a5eb SHA512 cd874175bc830da0321ea13eca9926fa64815648b3d74b890d0abd214da2d8a38e4f076174808be0d7189149ed6f2b36511718d2b4d1debad282872b249d1e50 WHIRLPOOL 870f48d90cacafe0bf8a53f9bbca9b150a7dcf0473b4330e21ccb4a4e643a44eca2b8682827661f9615106135f96cfc974671de5f0bf0b77ffee6684f737287c
-DIST libssh2-1.4.2.tar.gz 679992 SHA256 418c09061fb9c3c26fec391a35a062780b21b3199885e3b27054619582469bd3 SHA512 16f38b768e1e17f0652c803d692edb109cca35954f192052dbc40cb6e025f7bc5629c2338d0da97b6b1aa2cc2e12dde9523ef27729913fe50255dd42eca60684 WHIRLPOOL a65320eb7fa3c30b8a5f8f4899d4717e3ca3a00675b19a61457d55e5aa380fff078e77a2a96400735502e287af3c01c1fdc700fad3fa302be41c891d0e8272cc
+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
-EBUILD libssh2-1.4.2.ebuild 1107 SHA256 5510501aa9ce84fa64dd216c1890f7e8aa548fcaa99c2fe1af0790eefaef9b2e SHA512 758a6fa55d546ab68ebe5c13d4dacfe8aa88fdef94a69fa36248e5ca1eb3585a17c7f09d80d3b79b20ce4a91be87e5d2508e0a915cf67f7dcf04c6ae0bf69a61 WHIRLPOOL b0d4f199969e889533350bd088c5fdbe80c6d40fbf241cee55bf92b822897d27d360aa3f2b00a755ef42aa1d1347c1aa5b68c1c0c5727807efdbbf5a62ce2bd8
 EBUILD libssh2-1.4.3-r1.ebuild 1166 SHA256 7149cd9e6b7008638a38a086d4428dcb7479a3b3fe2f18312815ce1ba2472c68 SHA512 c7b63a8c97f12d4d8522fa131b22336fb9ce1a7fee70eba8a855232f743ff73d53a99f1276a098c592e0ec3f5bd68340a70a3c3d96bf1173745da2c3204c907b WHIRLPOOL 04e0f9c9fac29258be544ef0b4a4d016aa8249fe586d44b6f45bc5ab2975785498c89256f8715b1cb0b8045cb3789f831e0ac7318b1ebddb4c52bd8f5736b6ad
 EBUILD libssh2-1.4.3.ebuild 1049 SHA256 68da990fd7173d268817947a6d492b88f0c7e1a6a1c6b0b90e0cbb8b39ea85cd SHA512 1611f38415d60aff8e04a8142edb760490c7a79054a87deb20254adf3bca6eb8dd5f4e2ecdded8e2b4f7a15268f8c39d578ccde157a79a931b7614ae1caaf881 WHIRLPOOL e29b67ef22755ee4413893b622dbfe470a153991ce81f7197279feed0a10176a61483c32fba3aab0dcbdfea80b4d43ca931da833e296f4d8cc946396131e5a5c
-MISC ChangeLog 10760 SHA256 62efb753a55cfdcc3c91e3e8543485aece9eb61b7ed0bab9c90bd30992735fb7 SHA512 83a41e7a2f2b8143d25c45e999afe769e7e21c26c3905de4250414ac410b3ae5617dcd093cb3523aacf95f18eafd67e673e2b273494b6d9f6250b5d5b8a6fd10 WHIRLPOOL b87825da3c142e4af9760474d828c6a30dfda8b22950187b01ae0118499dcfb54ccb66a092559061f2da333d52e6eade54f4fdd0997f4e9a39273a6dcb5aba3e
+MISC ChangeLog 10885 SHA256 1420758c4dce5fe03a545aa7e3318afaa2cd7071a5ea6a9f8fc7135ed9e23a0a SHA512 6512ef724ad21cd26669a0a3565a75c3c9eab568df335d5fdda731f4c8a779ecf9e8550a37b6cd92039dae4289d49dbefb37c1356e4aa9c3e8ceb4ef8f71d71b WHIRLPOOL 0d0746116647d4262a79f87085d108a7e0e3af78c2388c692bd500f5f9b1d8c4d6cdffdbe0c30cdeeaa4723b0ff84ee13fe3f1a43468ca4ad6a4eda7a4c128a6
 MISC metadata.xml 249 SHA256 68839e8bf40ac510d514eef43e29e2050ca1145fc9bb538e2f289cffa9218fbc SHA512 0942479ade23fb7bc1f0df27fe5378390d0c140a3aca09f41c9e142b8b61551c787a67fb80f4ed31321616e334a1f75ee416fc81a4630e64d84c7f0f9c594195 WHIRLPOOL a9c005e1f4d1276d516cc318363fb23b75cfbeb256e92a62ab7fda6b18d333a3cd7f82548e242c8b9b4c65e07b7723bde7211697b6f3532690bcad0c0890effc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTofjcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOUn4P/3yuUzcsRCJpHXgWDTmvQlod
-OYy/HyR5oXGex74u3C/GwpsFIc61aEbbI3Gajo24VWVuTy0wVPdtRMo/d+LtD/Nl
-xkbde6JyFQQCg2iAmDdkijeL2joJy7KOfbucPMtF4dVJHOrHUsBgl5LUvSidnCbN
-BSganS8axUomE7BbF2ViYcz6I3ffggmpcAA6Ixx8N4dq2tsSvGA4sqlUYpipcVw1
-kfqoBVfbA1CsrJsj9XbTwQdK6l4WXjUFg2uOwuDtmCORm1XwV6ghkecmKvmmmCGg
-ojVq+FOlKkms1zIGf+7td4rq2gfbFFzuMpYxbV7DqMptIGQl6Se0vdKz+wK8oX2T
-gnxERBUvqA2oHAD85EAODK3BfJDpYPUu4+X7I2abJ8jeQLBUqxwRHsqAPDxaa6DA
-WhMhIrHlZCnjmdVIu9LWbrdvklN4ethJ5b/S0OQJkxNA8JdxXDz9PI434NjMNFyc
-xuFgkuxZvhdEJwOzfftAfxgfzUPPwRXwGfbFb8ABeVlY7ifI8NF9vdGZ8eznt617
-E8UPqP8jrGHJOClXaaTTyhCLnU0H9qZWsdECT6GVBVqLdyoSP74xMeI8lj9S7Pfu
-IYSklXRaKWx9dOeleUd3BqK1XgzSRdEt82Q37WgDKl9ei3e1xBMptiWhNagfKB7V
-7MIppKPJn2Hw0ANfjKBR
-=ElRg
+iEYEAREIAAYFAlPJP1sACgkQVWmRsqeSphMRBQCdECniR5b9qyjtXlKM6qRXahFH
+VnEAnRiiMZvOJd8+I0MWt/tgx+xbeiYu
+=5LxQ
 -----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
index 813e045da625..f741a256f7cd 100644
--- a/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch
+++ b/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch
@@ -1,5 +1,5 @@
---- libssh2-1.4.2/libssh2.pc.in
-+++ libssh2-1.4.2/libssh2.pc.in
+--- a/libssh2.pc.in
++++ b/libssh2.pc.in
 @@ -12,6 +12,6 @@
  Description: Library for SSH-based communication
  Version: @LIBSSH2VER@
diff --git a/net-libs/libssh2/libssh2-1.4.2.ebuild b/net-libs/libssh2/libssh2-1.4.2.ebuild
deleted file mode 100644
index 635285e0e969..000000000000
--- a/net-libs/libssh2/libssh2-1.4.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 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.10 2014/03/01 22:37:05 mgorny 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="gcrypt static-libs test zlib"
-
-DEPEND="!gcrypt? ( dev-libs/openssl )
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	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
-}