Removed old 0.1 and thus we don't abuse any more, bug #258104, thank Thilo Bangert for report. Changed version from 0.11 to 0.1.1 since that's what was intended. Fixed some QA warnings. Version bump up to 0.3.0.

(Portage version: 2.2_rc33/cvs/Linux i686, RepoMan options: --force)

7 files changed, 114 insertions, 34 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index 0bcfc7bd7587..47af4f6c28af 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-libs/libssh
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.11 2007/08/13 21:41:37 dertobi123 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.12 2009/05/25 21:00:09 pva Exp $
+
+*libssh-0.3.0 (25 May 2009)
+*libssh-0.1.1 (25 May 2009)
+
+  25 May 2009; Peter Volkov <pva@gentoo.org> -libssh-0.1.ebuild,
+  +libssh-0.1.1.ebuild, libssh-0.2.ebuild, +libssh-0.3.0.ebuild,
+  +files/libssh-0.3.0-automagic-crypt.patch, -libssh-0.11.ebuild,
+  metadata.xml:
+  Removed old 0.1 and thus we don't abuse any more, bug #258104, thank Thilo
+  Bangert for report. Changed version from 0.11 to 0.1.1 since that's what
+  was intended. Fixed some QA warnings. Version bump up to 0.3.0.
 
   13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> libssh-0.11.ebuild:
   ppc. stable
diff --git a/net-libs/libssh/files/libssh-0.3.0-automagic-crypt.patch b/net-libs/libssh/files/libssh-0.3.0-automagic-crypt.patch
new file mode 100644
index 000000000000..e786ddd0f8c1
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.3.0-automagic-crypt.patch
@@ -0,0 +1,37 @@
+=== modified file 'CMakeLists.txt'
+--- CMakeLists.txt	2009-05-25 19:43:46 +0000
++++ CMakeLists.txt	2009-05-25 19:54:56 +0000
+@@ -38,14 +38,24 @@
+ # search for libraries
+ find_package(ZLIB REQUIRED)
+ 
+-find_package(OpenSSL)
+-
+-if (NOT CRYPTO_FOUND)
+-  find_package(GCrypt)
+-  if (NOT GCRYPT_FOUND)
+-    message(FATAL_ERROR "Could not find OpenSSL or GCrypt")
+-  endif (NOT GCRYPT_FOUND)
+-endif (NOT CRYPTO_FOUND)
++option(WITH_GCRYPT "Prefer GCcrypt over OpenSSL" "AUTO")
++
++if (WITH_GCRYPT STREQUAL "AUTO")
++  find_package(OpenSSL)
++  if (NOT CRYPTO_FOUND)
++    find_package(GCrypt)
++  endif (NOT CRYPTO_FOUND)
++else ()
++  if (WITH_GCRYPT)
++    find_package(GCrypt)
++  else (WITH_GCRYPT)
++    find_package(OpenSSL)
++  endif (WITH_GCRYPT)
++endif (WITH_GCRYPT STREQUAL "AUTO")
++
++if (NOT CRYPTO_FOUND AND NOT GCRYPT_FOUND)
++  message(FATAL_ERROR "Could not find OpenSSL or GCrypt")
++endif (NOT CRYPTO_FOUND AND NOT GCRYPT_FOUND)
+ 
+ # config.h checks
+ include(ConfigureChecks.cmake)
+
diff --git a/net-libs/libssh/libssh-0.11.ebuild b/net-libs/libssh/libssh-0.1.1.ebuild
index d3a0a2ad2a9c..50b14232d3cc 100644
--- a/net-libs/libssh/libssh-0.11.ebuild
+++ b/net-libs/libssh/libssh-0.1.1.ebuild
@@ -1,10 +1,14 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.11.ebuild,v 1.5 2009/01/02 05:32:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.1.1.ebuild,v 1.1 2009/05/25 21:00:09 pva Exp $
 
+# Do not remove this ebuild until sysload depends on it.
+inherit versionator
+
+MY_P=${PN}-$(replace_version_separator 2 '')
 DESCRIPTION="access a working SSH implementation by means of a library"
 HOMEPAGE="http://0xbadc0de.be/?part=libssh"
-SRC_URI="http://www.0xbadc0de.be/libssh/${P}.tgz"
+SRC_URI="http://www.0xbadc0de.be/libssh/${MY_P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -13,6 +17,9 @@ IUSE=""
 
 DEPEND="sys-libs/zlib
 	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
 
 src_install() {
 	emake prefix="${D}/usr" install || die "make install failed"
diff --git a/net-libs/libssh/libssh-0.1.ebuild b/net-libs/libssh/libssh-0.1.ebuild
deleted file mode 100644
index b08fde09cc72..000000000000
--- a/net-libs/libssh/libssh-0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.1.ebuild,v 1.7 2005/03/05 18:11:31 kingtaco Exp $
-
-DESCRIPTION="access a working SSH implementation by means of a library"
-HOMEPAGE="http://0xbadc0de.be/projects/sshlib.html"
-SRC_URI="http://www.0xbadc0de.be/projects/libssh/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-DEPEND="sys-libs/zlib
-	dev-libs/openssl"
-
-src_install() {
-	make prefix="${D}/usr" install || die "make install failed"
-	newbin ssh ${PN}-ssh || die "newbin failed"
-	dosym ${PN}-ssh /usr/bin/${PN}-sftp
-	[ ! -e "${ROOT}/usr/bin/ssh" ] && dosym ${PN}-ssh /usr/bin/ssh
-	[ ! -e "${ROOT}/usr/bin/sftp" ] && dosym ${PN}-ssh /usr/bin/sftp
-	chmod a-x ${D}/usr/include/libssh/*
-}
diff --git a/net-libs/libssh/libssh-0.2.ebuild b/net-libs/libssh/libssh-0.2.ebuild
index 13258e590ef8..f32530eb84cc 100644
--- a/net-libs/libssh/libssh-0.2.ebuild
+++ b/net-libs/libssh/libssh-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.2.ebuild,v 1.1 2007/01/07 04:17:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.2.ebuild,v 1.2 2009/05/25 21:00:09 pva Exp $
 
 inherit eutils
 
@@ -9,12 +9,13 @@ HOMEPAGE="http://0xbadc0de.be/?part=libssh"
 SRC_URI="http://www.0xbadc0de.be/libssh/${P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~s390 ~x86"
 IUSE="crypt examples"
 
 DEPEND="sys-libs/zlib
 	!crypt? ( dev-libs/openssl )
 	crypt? ( dev-libs/libgcrypt )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -25,14 +26,13 @@ src_unpack() {
 src_compile() {
 	econf \
 		$(use_with crypt) \
-		--disable-ssh1 \
-		|| die "econf failed"
+		--disable-ssh1
 
 	emake || die "emake failed"
 }
 
 src_install() {
-	chmod a-x ${D}/usr/include/libssh/*
+	chmod a-x "${D}"/usr/include/libssh/*
 	emake DESTDIR="${D}" install || die "install failed"
 	rm "${D}"/usr/include/libssh/ssh1.h
 	dodoc README CHANGELOG
diff --git a/net-libs/libssh/libssh-0.3.0.ebuild b/net-libs/libssh/libssh-0.3.0.ebuild
new file mode 100644
index 000000000000..7eae9d89e965
--- /dev/null
+++ b/net-libs/libssh/libssh-0.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.3.0.ebuild,v 1.1 2009/05/25 21:00:09 pva 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"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~x86"
+IUSE="gcrypt examples +sftp ssh1 server zlib"
+
+DEPEND="zlib? ( >=sys-libs/zlib-1.2 )
+	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-automagic-crypt.patch"
+}
+
+src_configure() {
+	local mycmakeargs="$(cmake-utils_use_with gcrypt GCRYPT
+	cmake-utils_use_with zlib LIBZ
+	cmake-utils_use_with sftp SFTP
+	cmake-utils_use_with ssh1 SSH1
+	cmake-utils_use_with server SERVER)"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS README ChangeLog || die
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins sample.c samplesshd.c
+	fi
+}
diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index 3d967a83d7d4..1d3e62aa8869 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -3,4 +3,11 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <longdescription>access a working SSH implementation by means of a library</longdescription>
+<use>
+  <flag name='gcrypt'>Prefer <pkg>dev-libs/libgcrypt</pkg> over
+  <pkg>dev-libs/openssl</pkg> for encryption</flag>
+  <flag name='sftp'>Build with SFTP support</flag>
+  <flag name='ssh1'>Build with SSH1 support</flag>
+  <flag name='server'>Build with SSH server support</flag>
+</use>
 </pkgmetadata>