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

(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

6 files changed, 24 insertions, 175 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/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
 }