Renamed libgcrypt USE flag into gcrypt, bug #274555, thank Tristan Heaven for report. Cleaned old.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

9 files changed, 22 insertions, 144 deletions

diff --git a/net-libs/libssh2/ChangeLog b/net-libs/libssh2/ChangeLog
index fbaeea998d79..05645168328a 100644
--- a/net-libs/libssh2/ChangeLog
+++ b/net-libs/libssh2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.20 2009/04/23 09:41:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.21 2009/06/26 11:25:30 pva Exp $
+
+  26 Jun 2009; Peter Volkov <pva@gentoo.org> -libssh2-0.14.ebuild,
+  -libssh2-0.15.ebuild, -libssh2-0.17.ebuild, libssh2-0.18.ebuild,
+  -libssh2-1.0.ebuild, libssh2-1.1.ebuild, metadata.xml:
+  Renamed libgcrypt USE flag into gcrypt, bug #274555, thank Tristan Heaven
+  for report. Cleaned old.
 
   23 Apr 2009; Raúl Porcel <armin76@gentoo.org> libssh2-0.18.ebuild:
   arm/s390/sh stable
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 3c767761c85a..5d177f382918 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -2,17 +2,9 @@ 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
-DIST libssh2-1.0.tar.gz 565414 RMD160 bbf61bf25ec0e047828ddcb29c5e3303a527bbbd SHA1 630ad6509a25d1b585875637a459a95502ba0863 SHA256 2601c58bee8126b0a2adf1596010fc042abe0f2a8f446c6f7cfedf71e3d90e62
 DIST libssh2-1.1.tar.gz 582185 RMD160 6cc3d6dcf35178b8646efc18c4720b559720bbe0 SHA1 f3d65c8a24c6e8090366b9901e9be97a7d3f38e2 SHA256 507b7a60b7cafeef071c58a93d2c3c9ee07092a61d5ab29aee73e8c4c6c7020a
-EBUILD libssh2-0.14.ebuild 801 RMD160 40819fdcb0b3210076e9d9b5a8fb1c3f4a73fe53 SHA1 10998042c7a4f06a02b7532623f1991b67dc6155 SHA256 0ad44a24e111c87ecc95185f97856784524918862190511abbc007c03cd5ae1b
-EBUILD libssh2-0.15.ebuild 734 RMD160 ba28691334ee0c12b74d1c4a76f8393cee76e2dd SHA1 269dc452d6814260a57d6c3cdc4760e221b33db8 SHA256 84c95d1cb42535fee251937c631322abd19676089d0c3ac69c89c8c133e105dc
-EBUILD libssh2-0.17.ebuild 748 RMD160 cc51f9946f08770feac2334419cec929286ea12b SHA1 2d06b6a3e9acbc5b37c92a3b3a3b0b427662b496 SHA256 67f6f55a79fe2bca1215ca2cf5059a4780ca2c2cac7d6926c9de8bcb2baabcfd
-EBUILD libssh2-0.18.ebuild 803 RMD160 0dbcd80b89399b9a228092f324a19fdfd89dc225 SHA1 fc6b1a4c5f899bb9a63c2f50ebead16ac47b2a3f SHA256 62e371945eaf2bbfa7262cdde00b3c529b9d7a6a191c14ec5d5956c2e7a702e2
-EBUILD libssh2-1.0.ebuild 812 RMD160 86e1bddec22888d06c940e7e8361819788b5251d SHA1 2f14b79477ecbdba57a33c54e8ffe8b6cc2c51ef SHA256 6d4995c006d1350fac0ab4f390a15e032c16c6300933628c6885ccfc7e1cdaed
-EBUILD libssh2-1.1.ebuild 895 RMD160 52d5afc1a9f63575055cbbfe87fa41b8db75349c SHA1 d1860cb633581d5109c0dd23f1a49b3aceda09ec SHA256 1085bfa2f55ced44f0478a5e1c90248a5923845ef8aef2ac2ecb442465e9a6fa
-MISC ChangeLog 2632 RMD160 913e60488739d63be78a43ea129083fbb137e8ee SHA1 82169cccb7a9beba6c10c485961729335a853592 SHA256 6b5d258ecd52bc52cb373f1e945e38455f85b0c13a6c9e9a787a65946891c6de
-MISC metadata.xml 237 RMD160 d5d62111134d3627f8c6a38a25b31ce29463d8a0 SHA1 cf8676f902dc6922442ba70f8960d61b61321e63 SHA256 2b5a65c2d108fb4345b626b9e9dd9c7bbab7adf3a95b978b4b9e696fc82251ac
+EBUILD libssh2-0.18.ebuild 775 RMD160 dc339e1c1550144039a1d1e989d4c027169022b6 SHA1 65bc6ffccd63486726ca38442a5e19cfb3ba392f SHA256 c493d2ce17ace2366319d6bc9e77c22b4416c99bf2b43aaeccfa8a3bb4d48eb9
+EBUILD libssh2-1.1.ebuild 879 RMD160 e13ac3abe4686540823c7141c9317fbf1633a893 SHA1 88555278bfc9c90371207e7248438055cf9f26a6 SHA256 90b4d0849069342bd72a6f6a725427b0240dc347d86b67d9471efadb96c4825f
+MISC ChangeLog 2923 RMD160 bae390c02917d9aaf2c9f8b33c222e9c972279c5 SHA1 a307c0501a74c744140199060642f6aa61477905 SHA256 398ddc748f0f44f77e06f8646ffbaca464aec3560176038de05b439cac328e65
+MISC metadata.xml 254 RMD160 999b0e56d48f4d85cef9cd4560ee0d251581421b SHA1 73eb56da4bf79beda2ad262cd42a41ba2c21bb66 SHA256 776a37a5fdfe9fc7935617b72ec8def2a97350c40c658ee8dafe14b5dbf2633b
diff --git a/net-libs/libssh2/libssh2-0.14.ebuild b/net-libs/libssh2/libssh2-0.14.ebuild
deleted file mode 100644
index f700e8f71e27..000000000000
--- a/net-libs/libssh2/libssh2-0.14.ebuild
+++ /dev/null
@@ -1,33 +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 $
-
-inherit eutils
-
-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
-	sys-libs/zlib"
-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"
-}
-
-src_install() {
-	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 4b1fdaf1bcfe..000000000000
--- a/net-libs/libssh2/libssh2-0.15.ebuild
+++ /dev/null
@@ -1,29 +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 $
-
-inherit eutils
-
-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 )
-	libgcrypt? ( dev-libs/libgcrypt )
-	sys-libs/zlib"
-RDEPEND=${DEPEND}
-
-src_compile() {
-	econf $(use_enable libgcrypt) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	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 2768a570b98c..000000000000
--- a/net-libs/libssh2/libssh2-0.17.ebuild
+++ /dev/null
@@ -1,29 +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 $
-
-inherit eutils
-
-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 )
-	libgcrypt? ( dev-libs/libgcrypt )
-	sys-libs/zlib"
-RDEPEND=${DEPEND}
-
-src_compile() {
-	econf $(use_enable libgcrypt) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	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 03be26f041c0..b21320fc641e 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 $
 
 inherit eutils
 
@@ -11,15 +11,15 @@ 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 )
-	libgcrypt? ( dev-libs/libgcrypt )
+DEPEND="!gcrypt? ( dev-libs/openssl )
+	gcrypt? ( dev-libs/libgcrypt )
 	sys-libs/zlib"
 RDEPEND=${DEPEND}
 
 src_compile() {
-	econf $(use_enable libgcrypt) || die "econf failed"
+	econf $(use_enable gcrypt libgcrypt)
 	emake || die "emake failed"
 }
 
diff --git a/net-libs/libssh2/libssh2-1.0.ebuild b/net-libs/libssh2/libssh2-1.0.ebuild
deleted file mode 100644
index cd52b054a9d6..000000000000
--- a/net-libs/libssh2/libssh2-1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-1.0.ebuild,v 1.2 2009/04/09 13:44:02 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="http://www.libssh2.org/"
-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"
-
-DEPEND="!libgcrypt? ( dev-libs/openssl )
-	libgcrypt? ( dev-libs/libgcrypt )
-	sys-libs/zlib"
-RDEPEND=${DEPEND}
-
-src_compile() {
-	econf $(use_enable libgcrypt) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
diff --git a/net-libs/libssh2/libssh2-1.1.ebuild b/net-libs/libssh2/libssh2-1.1.ebuild
index cb402f986e6e..df6f8e62709c 100644
--- a/net-libs/libssh2/libssh2-1.1.ebuild
+++ b/net-libs/libssh2/libssh2-1.1.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-1.1.ebuild,v 1.1 2009/04/18 15:25:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.1.ebuild,v 1.2 2009/06/26 11:25:30 pva Exp $
 
 EAPI="2"
 
@@ -11,17 +11,17 @@ 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 zlib"
+IUSE="gcrypt zlib"
 
-DEPEND="!libgcrypt? ( dev-libs/openssl )
-	libgcrypt? ( dev-libs/libgcrypt )
+DEPEND="!gcrypt? ( dev-libs/openssl )
+	gcrypt? ( dev-libs/libgcrypt )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local myconf
 
-	if use libgcrypt ; then
+	if use gcrypt ; then
 		myconf="--with-libgcrypt"
 	else
 		myconf="--with-openssl"
diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml
index d60201e8980f..a6539ed2cf08 100644
--- a/net-libs/libssh2/metadata.xml
+++ b/net-libs/libssh2/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <herd>netmon</herd>
   <use>
-    <flag name="libgcrypt">Use libgcrypt for crypto</flag>
+    <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for crypto</flag>
   </use>
 </pkgmetadata>