synced net-libs/libssh2 with portage tree

11 files changed, 8 insertions, 250 deletions

diff --git a/metadata/cache/net-libs/libssh2-0.14 b/metadata/cache/net-libs/libssh2-0.14
deleted file mode 100644
index d8eac2e5b..000000000
--- a/metadata/cache/net-libs/libssh2-0.14
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/openssl[lib32?] sys-libs/zlib[lib32?] sys-apps/abi-wrapper
-dev-libs/openssl[lib32?] sys-libs/zlib[lib32?] sys-apps/abi-wrapper
-0
-mirror://sourceforge/libssh2/libssh2-0.14.tar.gz
-
-http://www.libssh2.org/
-BSD
-Library implementing the SSH2 protocol
-~x86
-base eutils multilib multilib-native portability toolchain-funcs
-lib32
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-libs/libssh2-0.15 b/metadata/cache/net-libs/libssh2-0.15
deleted file mode 100644
index 13d6d5941..000000000
--- a/metadata/cache/net-libs/libssh2-0.15
+++ /dev/null
@@ -1,22 +0,0 @@
-!libgcrypt? ( dev-libs/openssl[lib32?] ) libgcrypt? ( dev-libs/libgcrypt[lib32?] ) sys-libs/zlib[lib32?] sys-apps/abi-wrapper
-!libgcrypt? ( dev-libs/openssl[lib32?] ) libgcrypt? ( dev-libs/libgcrypt[lib32?] ) sys-libs/zlib[lib32?] sys-apps/abi-wrapper
-0
-mirror://sourceforge/libssh2/libssh2-0.15.tar.gz
-
-http://www.libssh2.org/
-BSD
-Library implementing the SSH2 protocol
-~x86
-base eutils multilib multilib-native portability toolchain-funcs
-libgcrypt lib32
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-libs/libssh2-0.17 b/metadata/cache/net-libs/libssh2-0.17
deleted file mode 100644
index 3b0c88255..000000000
--- a/metadata/cache/net-libs/libssh2-0.17
+++ /dev/null
@@ -1,22 +0,0 @@
-!libgcrypt? ( dev-libs/openssl[lib32?] ) libgcrypt? ( dev-libs/libgcrypt[lib32?] ) sys-libs/zlib[lib32?] sys-apps/abi-wrapper
-!libgcrypt? ( dev-libs/openssl[lib32?] ) libgcrypt? ( dev-libs/libgcrypt[lib32?] ) sys-libs/zlib[lib32?] sys-apps/abi-wrapper
-0
-mirror://sourceforge/libssh2/libssh2-0.17.tar.gz
-
-http://www.libssh2.org/
-BSD
-Library implementing the SSH2 protocol
-~amd64 ~x86
-base eutils multilib multilib-native portability toolchain-funcs
-libgcrypt lib32
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-libs/libssh2-0.18 b/metadata/cache/net-libs/libssh2-0.18
index ddef52a16..a8baecce9 100644
--- a/metadata/cache/net-libs/libssh2-0.18
+++ b/metadata/cache/net-libs/libssh2-0.18
@@ -1,5 +1,5 @@
-!libgcrypt? ( dev-libs/openssl[lib32?] ) libgcrypt? ( dev-libs/libgcrypt[lib32?] ) sys-libs/zlib[lib32?] sys-apps/abi-wrapper
-!libgcrypt? ( dev-libs/openssl[lib32?] ) libgcrypt? ( dev-libs/libgcrypt[lib32?] ) sys-libs/zlib[lib32?] sys-apps/abi-wrapper
+!gcrypt? ( dev-libs/openssl[lib32?] ) gcrypt? ( dev-libs/libgcrypt[lib32?] ) sys-libs/zlib[lib32?] sys-apps/abi-wrapper
+!gcrypt? ( dev-libs/openssl[lib32?] ) gcrypt? ( dev-libs/libgcrypt[lib32?] ) sys-libs/zlib[lib32?] sys-apps/abi-wrapper
 0
 mirror://sourceforge/libssh2/libssh2-0.18.tar.gz
 
@@ -8,7 +8,7 @@ BSD
 Library implementing the SSH2 protocol
 alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 base eutils multilib multilib-native portability toolchain-funcs
-libgcrypt lib32
+gcrypt lib32
 
 
 
diff --git a/net-libs/libssh2/ChangeLog b/net-libs/libssh2/ChangeLog
deleted file mode 100644
index 3acfaf6b4..000000000
--- a/net-libs/libssh2/ChangeLog
+++ /dev/null
@@ -1,65 +0,0 @@
-# ChangeLog for net-libs/libssh2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.16 2009/01/24 12:33:45 aballier Exp $
-
-  24 Jan 2009; Alexis Ballier <aballier@gentoo.org> libssh2-0.18.ebuild:
-  keyword ~x86-fbsd
-
-  25 Aug 2008; Jeroen Roovers <jer@gentoo.org> libssh2-0.18.ebuild:
-  Stable for HPPA (bug #233122).
-
-  02 Aug 2008; Markus Rothe <corsair@gentoo.org> libssh2-0.18.ebuild:
-  Stable on ppc64; bug #233122
-
-  01 Aug 2008; nixnut <nixnut@gentoo.org> libssh2-0.18.ebuild:
-  Stable on ppc wrt bug 233122
-
-  30 Jul 2008; Dawid Węgliński <cla@gentoo.org> libssh2-0.18.ebuild:
-  Stable on amd64 (bug #233122)
-
-  29 Jul 2008; Raúl Porcel <armin76@gentoo.org> libssh2-0.18.ebuild:
-  alpha/ia64/sparc/x86 stable wrt #233122
-
-  29 Apr 2008; <ricmm@gentoo.org> libssh2-0.18.ebuild:
-  Add ~mips, bug #215709
-
-  04 Apr 2008; Brent Baude <ranger@gentoo.org> libssh2-0.18.ebuild:
-  Marking libssh2-0.18 ~ppc
-
-  04 Apr 2008; Brent Baude <ranger@gentoo.org> libssh2-0.18.ebuild:
-  keyworded ~arch for ppc64, bug 215709
-
-  01 Apr 2008; Raúl Porcel <armin76@gentoo.org> libssh2-0.18.ebuild:
-  Add ~alpha/~ia64/~sparc wrt #215709
-
-  01 Apr 2008; Jeroen Roovers <jer@gentoo.org> libssh2-0.18.ebuild:
-  Marked ~hppa.
-
-*libssh2-0.18 (23 Dec 2007)
-
-  23 Dec 2007; Cédric Krier <cedk@gentoo.org> +libssh2-0.18.ebuild:
-  Version bump
-
-  13 Sep 2007; Daniel Black <dragonheart@gentoo.org> libssh2-0.17.ebuild:
-  added ~amd64 keyword - works with curl-7.17.0-r1
-
-*libssh2-0.17 (29 Aug 2007)
-
-  29 Aug 2007; Cédric Krier <cedk@gentoo.org> +libssh2-0.17.ebuild:
-  Version bump
-
-*libssh2-0.15 (01 Jul 2007)
-
-  01 Jul 2007; Cédric Krier <cedk@gentoo.org> +libssh2-0.15.ebuild:
-  Version bump
-
-*libssh2-0.14 (27 Nov 2006)
-
-  27 Nov 2006; Markus Ullmann <jokey@gentoo.org>
-  +files/libssh2-0.14-banner-wait.patch,
-  +files/libssh2-0.14-channel-failure.patch,
-  +files/libssh2-0.14-configure.patch,
-  +files/libssh2-0.14-peer-shutdown.patch, +metadata.xml,
-  +libssh2-0.14.ebuild:
-  Import from sunrise for bug 113844 thanks to Joe and cedk
-
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 7f6cc0369..9bbdf35bc 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -2,13 +2,5 @@ AUX libssh2-0.14-banner-wait.patch 675 RMD160 833419dd74233e52a37416d1f94c746b92
 AUX libssh2-0.14-channel-failure.patch 700 RMD160 1393b9e07a8760fb75c95c37604044b4181acc2e SHA1 d0eb800c79488254b5ac46a689164e1e7434d61d SHA256 121d8a0385d36f8a4c01d746719d1745a04cafb8a3a6e47c637d1395e89c1617
 AUX libssh2-0.14-configure.patch 545 RMD160 47f83facd1be7198145a535c1ae88c459408aa8f SHA1 f68fd70d04a6522a4fb8b294d67b243f329f0962 SHA256 af8d0c9afdeb20501f6062dbedaa044a7eff42ef23ffe18d71d9fc2abff341db
 AUX libssh2-0.14-peer-shutdown.patch 1191 RMD160 086e212748aedcb002c5e120e7a55e2fa796310a SHA1 765dff3df921bf26528a2818251f030fcd631a92 SHA256 d902d7777621e34d454ec8a109358427536890298256308e5f38cf96e251ff52
-DIST libssh2-0.14.tar.gz 140033 RMD160 65efe90d2879ecc0eeb094aa1582196ef6847408 SHA1 6b0f80a6e307298af862ece5d19e423b99adc705 SHA256 5f18347bd3d45c5b79162b91221a764f18ed3c30f0a7cab8c03baa680131b653
-DIST libssh2-0.15.tar.gz 513787 RMD160 887a780a23893ea1709311a61e69b37041bc14be SHA1 4f52ba37d85c227bd9bb013ee2e3ef46d20d2ae5 SHA256 062cc96257a635a8800acbc84dc1555ac943df9ce040e2a40d6ffc39d07690cd
-DIST libssh2-0.17.tar.gz 539701 RMD160 e0dc2ff3801ed9a13527445fb91ceb0fd1d1840b SHA1 21ab04c457c9e163b1413d8afeb277f3a9025592 SHA256 ae16a9452173fb6656f3720c4a0f602414353c2dd514e31e81f7956dc6177304
 DIST libssh2-0.18.tar.gz 541428 RMD160 2088c73a7903828670e14c6289a6961f5a3e4764 SHA1 9bc6148869fca08350e27ea2c9fc44917ac027ff SHA256 6964a5869d757c8c9f64256bdafcff302826acf9898150ada69eb229b3017ccc
-EBUILD libssh2-0.14.ebuild 868 RMD160 5a02ad12c5777e36d3ad4a72aaea4a6a823c0ea4 SHA1 14632b6d12c9da46f7c0160002a5e833098b7e9b SHA256 caeabb6356244dd8393d2a00fafc1cd760a92f689909de8aaa35d1d71dc56dcc
-EBUILD libssh2-0.15.ebuild 807 RMD160 592b72777dbd8021d72e2446b13bca3c493c19ed SHA1 82a74c93b838d6ee65e44874f6c0225458763187 SHA256 8e232463bc1a31e66fdd6711fdd89883304ed8e0bad2fcf5983cdc5b51eca628
-EBUILD libssh2-0.17.ebuild 821 RMD160 f31d23fd3385e038caf9a3f8d1aaffd308820594 SHA1 e7daca02396c2f9ab96f584cd5937067614c94d7 SHA256 df1043758d2fb2b55e234c8c969343a2df192c9191d271fdf0befe8bf94862df
-EBUILD libssh2-0.18.ebuild 876 RMD160 00fe008a8c28b2fda7f3f621167a6cd29ea66524 SHA1 0072a0cf545542eb4f2e8f7c7063558156d0968f SHA256 b47086394f69e2b708380e7b3e7f8dfb571c7f396ff408c48862b03a74854091
-MISC ChangeLog 2113 RMD160 4d400f6510e882031a49836c9a6a2b5d06ae7aac SHA1 dacca12f6cbc3ecc49861a2d561e6559907a0ce5 SHA256 791e2060481ac577b547ebba7f6072c5b7c1c070f93c2cd3c1de8cad8808c246
-MISC metadata.xml 237 RMD160 d5d62111134d3627f8c6a38a25b31ce29463d8a0 SHA1 cf8676f902dc6922442ba70f8960d61b61321e63 SHA256 2b5a65c2d108fb4345b626b9e9dd9c7bbab7adf3a95b978b4b9e696fc82251ac
+EBUILD libssh2-0.18.ebuild 863 RMD160 0b3d806bc405c135db7d48dcbeffe306877c79c6 SHA1 f5a06ebe11c2db459affc701031235a09ae63509 SHA256 0f1e68a9ee1d13f3e331b6615670a99556eaa0ade39aa970bc8e33e098bc7afa
diff --git a/net-libs/libssh2/libssh2-0.14.ebuild b/net-libs/libssh2/libssh2-0.14.ebuild
deleted file mode 100644
index a0306c760..000000000
--- a/net-libs/libssh2/libssh2-0.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-0.14.ebuild,v 1.1 2006/11/27 23:57:08 jokey Exp $
-
-EAPI="2"
-
-inherit eutils multilib-native
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="http://www.libssh2.org/"
-SRC_URI="mirror://sourceforge/libssh2/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl[lib32?]
-	sys-libs/zlib[lib32?]"
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-configure.patch"
-	epatch "${FILESDIR}/${P}-banner-wait.patch"
-	epatch "${FILESDIR}/${P}-channel-failure.patch"
-	epatch "${FILESDIR}/${P}-peer-shutdown.patch"
-}
-
-multilib-native_src_install_internal() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
diff --git a/net-libs/libssh2/libssh2-0.15.ebuild b/net-libs/libssh2/libssh2-0.15.ebuild
deleted file mode 100644
index 204b7f95a..000000000
--- a/net-libs/libssh2/libssh2-0.15.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-0.15.ebuild,v 1.1 2007/07/01 12:38:25 cedk Exp $
-
-EAPI="2"
-
-inherit eutils multilib-native
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="http://www.libssh2.org/"
-SRC_URI="mirror://sourceforge/libssh2/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="libgcrypt"
-
-DEPEND="!libgcrypt? ( dev-libs/openssl[lib32?] )
-	libgcrypt? ( dev-libs/libgcrypt[lib32?] )
-	sys-libs/zlib[lib32?]"
-RDEPEND=${DEPEND}
-
-multilib-native_src_configure_internal() {
-	econf $(use_enable libgcrypt) || die "econf failed"
-}
-
-multilib-native_src_install_internal() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
diff --git a/net-libs/libssh2/libssh2-0.17.ebuild b/net-libs/libssh2/libssh2-0.17.ebuild
deleted file mode 100644
index 72b8856b9..000000000
--- a/net-libs/libssh2/libssh2-0.17.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-0.17.ebuild,v 1.2 2007/09/13 23:00:57 dragonheart Exp $
-
-EAPI="2"
-
-inherit eutils multilib-native
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="http://www.libssh2.org/"
-SRC_URI="mirror://sourceforge/libssh2/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libgcrypt"
-
-DEPEND="!libgcrypt? ( dev-libs/openssl[lib32?] )
-	libgcrypt? ( dev-libs/libgcrypt[lib32?] )
-	sys-libs/zlib[lib32?]"
-RDEPEND=${DEPEND}
-
-multilib-native_src_configure_internal() {
-	econf $(use_enable libgcrypt) || die "econf failed"
-}
-
-multilib-native_src_install_internal() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
diff --git a/net-libs/libssh2/libssh2-0.18.ebuild b/net-libs/libssh2/libssh2-0.18.ebuild
index 63296a675..541ce4651 100644
--- a/net-libs/libssh2/libssh2-0.18.ebuild
+++ b/net-libs/libssh2/libssh2-0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-0.18.ebuild,v 1.14 2009/04/23 09:41:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-0.18.ebuild,v 1.15 2009/06/26 11:25:30 pva Exp $
 
 EAPI="2"
 
@@ -13,10 +13,10 @@ SRC_URI="mirror://sourceforge/libssh2/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="libgcrypt"
+IUSE="gcrypt"
 
-DEPEND="!libgcrypt? ( dev-libs/openssl[lib32?] )
-	libgcrypt? ( dev-libs/libgcrypt[lib32?] )
+DEPEND="!gcrypt? ( dev-libs/openssl[lib32?] )
+	gcrypt? ( dev-libs/libgcrypt[lib32?] )
 	sys-libs/zlib[lib32?]"
 RDEPEND=${DEPEND}
 
diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml
deleted file mode 100644
index d60201e89..000000000
--- a/net-libs/libssh2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>netmon</herd>
-  <use>
-    <flag name="libgcrypt">Use libgcrypt for crypto</flag>
-  </use>
-</pkgmetadata>