Sync live ebuild with latest release. Drop overshadowed. Stabilise 0.4.8 on amd64 and x86.

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

7 files changed, 27 insertions, 198 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index 9b98717c1e72..bc8f575b6c4e 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-libs/libssh
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.38 2011/02/01 07:49:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.39 2011/02/21 15:09:51 scarabeus Exp $
+
+  21 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libssh-0.3.4.ebuild,
+  -libssh-0.4.4.ebuild, -libssh-0.4.6.ebuild, libssh-0.4.8.ebuild,
+  libssh-9999.ebuild:
+  Sync live ebuild with latest release. Drop overshadowed. Stabilise 0.4.8 on
+  amd64 and x86.
+
+  21 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libssh-0.3.4.ebuild,
+  -libssh-0.4.4.ebuild, -libssh-0.4.6.ebuild, libssh-0.4.8.ebuild,
+  libssh-9999.ebuild:
+  Sync live ebuild with latest release. Drop overshadowed. Stabilise 0.4.8 on
+  amd64 and x86.
 
 *libssh-0.4.8 (01 Feb 2011)
 
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 152da4c4305b..68c5fba9d1c9 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,29 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libssh-0.3.0-automagic-crypt.patch 980 RMD160 2085b57b9569d0a96fb31e45b601fe4694a5da5f SHA1 9478541d582586e60478e9d79d8cddba5bb082cf SHA256 2a55d50d761000277b37189d1f066bc20a334fbedab36d64ec442a8135d0322c
 AUX libssh-0.4.1-debug-build.patch 657 RMD160 092134adfbdb420a519fba0988909f419f7275dd SHA1 7d98b47dd7c9436540685b651433898d2c98e1f5 SHA256 324ff361a7466b23d535fb33c6f6251d021da530026ce31da247f6b88ca38ae6
-DIST libssh-0.3.4.tar.gz 224320 RMD160 cbcd4a60180dca7f2ccb4c665f37a5fff4630ddd SHA1 abded99e80706ae8d50f5f25e1a3eed3c909513d SHA256 d22477fa90252bf615fd0755c44006a2f9223d9da6fa04e00fa398e4a2c15761
 DIST libssh-0.4.1.tar.gz 252598 RMD160 0d2434737f33db1b6a14035804ba1ffffb72387d SHA1 7bda197eb17c7179837a18d97cd1f466ffe5bdc6 SHA256 a6d2ae8212182cb366230de3cc3977779b5010c85f9a157ca9850bc6bf8f2238
-DIST libssh-0.4.4.tar.gz 274671 RMD160 4e9de699bf3a7b33a9278c2d7c4ba88f4fd7faab SHA1 bde1d4713a86b6256ce2d14e6de6326e52c4da44 SHA256 3c21e35c42af3766fc57e7b10c23e5a45a97fc77b52bb14b94cd05532de9d1ac
-DIST libssh-0.4.6.tar.gz 276843 RMD160 d33a2f3b1aaf3da33117e6fe0b10949e7234efea SHA1 52e7e68590fbcd835bc4a2eceb51e672641efb69 SHA256 17ef7bacb3c6c53e67c12767266e4826c6a594452a1a6fd13394f14a67f26988
 DIST libssh-0.4.8.tar.gz 277614 RMD160 1f2b31e7ff87fda102050d97ba5d10ea96b95b8d SHA1 97750c95389e425e10c9b1a8f8ce49667e7fbfe0 SHA256 15c239a426c7fbdddf97127ffddee6c4a5bcafac37f94987cf4f28cf218aa815
-EBUILD libssh-0.3.4.ebuild 1328 RMD160 ca309c5d2b3df1a9f55d5d90cbf407827c64296d SHA1 f522d53ae4a0f741f9cc6fab4b57ab3b0f7dd758 SHA256 0748b21a6be049f94d70d999483a25470d4dd3a8bd29ea7b3461aff79b6f92be
 EBUILD libssh-0.4.1.ebuild 1463 RMD160 699c9a7c2637ddd1a19c37e1736e83b8526b5d08 SHA1 e98056bff68fe862ebd270a8d3bb46a1fe5b9cd6 SHA256 60ecf5dcc59c8ba52b5a0d2a2530c178b9302b61aeb577a0fd01a7d2155972a1
-EBUILD libssh-0.4.4.ebuild 1418 RMD160 8d30bf16a839eb2de50327c860d2dbab305b6a97 SHA1 4492149c4630913fc2fd0f7368dffa7d50de4e1a SHA256 32b0dcb54a8f41a66f09252b4c20ca98abb619dbe20f04758adee7df3c9982cb
-EBUILD libssh-0.4.6.ebuild 1427 RMD160 db6f1be4b2503eaa600ed1f9e0504e02707ac49d SHA1 8e53592273a81017d212d4ee6e69cdc80037ccde SHA256 56685fd068b096c5411d93e008677415f744df190bd1d87cc60163987be9299c
-EBUILD libssh-0.4.8.ebuild 1473 RMD160 4c57f66e9d7eeaa54293240da4c56af655716f82 SHA1 3c324a439a00353e42939180d922bfad39dfc1f7 SHA256 463f96d79cb425b6685c4be4a4e648d2beaa2a505dfd8d91ed8c55d1fa8959e8
-EBUILD libssh-9999.ebuild 1306 RMD160 c0fb728b7596bc863a35325121025e8159b677c1 SHA1 ee69b93ca688f4e6d741cc42db0951bdc03110d0 SHA256 ca6de9f641b51118b2e5b20ede272359b0dd7e1f6a7e86d9093efdfd80f908d0
-MISC ChangeLog 5300 RMD160 a0e468180e772e8583abfcfb4881105e51f2d440 SHA1 749fca819afed096c2213c7ea51eb4d01bd9a79a SHA256 9dd14ba2b3a3c1d53d8136e1d2ca01a1254e1c1401d7bc7d350528ea85eca194
+EBUILD libssh-0.4.8.ebuild 1475 RMD160 aeeea14cd1bc10c2a74c58d4f312e4f5c94bd67d SHA1 4d7624abdae37a90c4fbdcd1df34b82096a71d84 SHA256 95fa43f6b888bfe623036f64c231288174de70535c31d30b62a5fd67407de696
+EBUILD libssh-9999.ebuild 1334 RMD160 05ffacd7efb01f1903c7ac3ff6e36fe8de5d5c60 SHA1 5de92409e7afb2aac388549cc96c892bea0df3e2 SHA256 177295344d7f744b7abaaa068fc410572af7ea12415b4009b25a8a00f5d80519
+MISC ChangeLog 5824 RMD160 2239e55599fd390417967facef6cbf1d63911f25 SHA1 3dad7c8939cb4e4669c9013023456081536bcb52 SHA256 5374b38290b113e86e5848373a2282f44327b6d2b90d38a9d92fa7f27492eecf
 MISC metadata.xml 617 RMD160 62c9a2d4ef7d2d96b7d92d991955fabd7e852938 SHA1 3a3043b5b0684bb959008f0107957841cee6b4cb SHA256 cad0b9d4d822716fa2a55fde2b79b85456b83a555a07161190d3ad48400cae8c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBAgAGBQJNR7stAAoJEEqz6FtPBkyjxdsH/3sybm8lW3lfEkFPOtstNe6J
-hkzKWg/z7k36THn0NhmZVQNMeiisgLRDUj95SrGbG0shYRqdLxcqHMFgkkhfRaCw
-anO63z/K5d+6uPjN/x37bYKIF/xiXfGnnYBkv9CW04nzV0pEeavLVU46zk+SRqNA
-Sg61ll7krvw6M/l3k8xmLABgciokU1V9IaT3O6eNLS9TdxvHBXWsaDNn21txv7Ae
-5fJUgwnFjDI6bFj+MkQ1Koat3Iq331lg7gDH1HKbPZ9ZTE2eKeOjS/hAdO4aBbnG
-5RbzqhUrwKVKIK4Y/HccPvqw44euE1XyZ79dxhIB+hdlQo33A70fAzTYq7a1b6s=
-=Fbik
------END PGP SIGNATURE-----
diff --git a/net-libs/libssh/libssh-0.3.4.ebuild b/net-libs/libssh/libssh-0.3.4.ebuild
deleted file mode 100644
index 2d909dee75ba..000000000000
--- a/net-libs/libssh/libssh-0.3.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.3.4.ebuild,v 1.5 2010/01/18 19:02:09 armin76 Exp $
-
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-EAPI="2"
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="http://www.libssh.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ppc ~s390 ~sparc x86"
-SLOT="0"
-IUSE="debug gcrypt examples +sftp ssh1 server static-libs zlib"
-
-DEPEND="
-	zlib? ( >=sys-libs/zlib-1.2 )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS README ChangeLog"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.0-automagic-crypt.patch"
-)
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with zlib LIBZ)
-		$(cmake-utils_use_with sftp)
-		$(cmake-utils_use_with ssh1)
-		$(cmake-utils_use_with server)
-		$(cmake-utils_use_with static-libs STATIC_LIB)
-	"
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples; then
-		insinto "${ROOT}"usr/share/doc/"${PF}"/examples
-		doins sample.c samplesshd.c
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.4.4.ebuild b/net-libs/libssh/libssh-0.4.4.ebuild
deleted file mode 100644
index bf7dfbf6e9c7..000000000000
--- a/net-libs/libssh/libssh-0.4.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.4.4.ebuild,v 1.1 2010/06/01 09:29:50 scarabeus Exp $
-
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="http://www.${PN}.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="debug gcrypt examples +sftp ssh1 server static-libs zlib"
-
-DEPEND="
-	zlib? ( >=sys-libs/zlib-1.2 )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS README ChangeLog"
-
-src_prepare() {
-	sed -i '/add_subdirectory(examples)/s/^/#DONOTWANT/' CMakeLists.txt
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
-		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with zlib LIBZ)
-		$(cmake-utils_use_with sftp)
-		$(cmake-utils_use_with ssh1)
-		$(cmake-utils_use_with server)
-		$(cmake-utils_use_with static-libs STATIC_LIB)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.4.6.ebuild b/net-libs/libssh/libssh-0.4.6.ebuild
deleted file mode 100644
index ae12ef7f87f0..000000000000
--- a/net-libs/libssh/libssh-0.4.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.4.6.ebuild,v 1.1 2010/11/22 21:36:41 scarabeus Exp $
-
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-EAPI=3
-
-inherit cmake-utils
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="http://www.${PN}.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="debug gcrypt examples +sftp ssh1 server static-libs zlib"
-
-DEPEND="
-	zlib? ( >=sys-libs/zlib-1.2 )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS README ChangeLog"
-
-src_prepare() {
-	sed -i '/add_subdirectory(examples)/s/^/#DONOTWANT/' CMakeLists.txt
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
-		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with zlib LIBZ)
-		$(cmake-utils_use_with sftp)
-		$(cmake-utils_use_with ssh1)
-		$(cmake-utils_use_with server)
-		$(cmake-utils_use_with static-libs STATIC_LIB)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples; then
-		insinto "${EROOT}"usr/share/doc/"${PF}"/examples
-		doins examples/*.c
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.4.8.ebuild b/net-libs/libssh/libssh-0.4.8.ebuild
index 10c98bcb4b98..69bac4d0c5f7 100644
--- a/net-libs/libssh/libssh-0.4.8.ebuild
+++ b/net-libs/libssh/libssh-0.4.8.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.4.8.ebuild,v 1.1 2011/02/01 07:49:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.4.8.ebuild,v 1.2 2011/02/21 15:09:51 scarabeus Exp $
 
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 EAPI=3
 
-inherit cmake-utils
+inherit eutils cmake-utils
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
 HOMEPAGE="http://www.libssh.org/"
 SRC_URI="http://www.${PN}.org/files/${PV:0:3}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="debug examples gcrypt pcap +sftp ssh1 server static-libs zlib"
 
@@ -31,7 +31,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
 		$(cmake-utils_use_with debug DEBUG_CRYPTO)
 		$(cmake-utils_use_with gcrypt)
@@ -50,7 +50,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use examples; then
-		insinto "${EROOT}"usr/share/doc/"${PF}"/examples
+		insinto /usr/share/doc/"${PF}"/examples
 		doins examples/*.c
 	fi
 }
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 456ef3a6c307..cb2c2ae2f292 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-9999.ebuild,v 1.2 2011/01/01 15:59:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-9999.ebuild,v 1.3 2011/02/21 15:09:51 scarabeus Exp $
 
 EAPI=3
 
@@ -29,15 +29,16 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
 		$(cmake-utils_use_with debug DEBUG_CRYPTO)
 		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with zlib LIBZ)
+		$(cmake-utils_use_with pcap)
+		$(cmake-utils_use_with server)
 		$(cmake-utils_use_with sftp)
 		$(cmake-utils_use_with ssh1)
-		$(cmake-utils_use_with server)
 		$(cmake-utils_use_with static-libs STATIC_LIB)
+		$(cmake-utils_use_with zlib LIBZ)
 	)
 
 	cmake-utils_src_configure
@@ -47,7 +48,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use examples; then
-		insinto "${EROOT}"usr/share/doc/"${PF}"/examples
+		insinto /usr/share/doc/"${PF}"/examples
 		doins examples/*.c
 	fi
 }