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.

Package-Manager: portage-2.2_rc33/cvs/Linux i686
RepoMan-Options: --force

8 files changed, 121 insertions, 50 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/Manifest b/net-libs/libssh/Manifest
index 8fbb2c12db54..5b901049c00e 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libssh-0.3.0-automagic-crypt.patch 980 RMD160 2085b57b9569d0a96fb31e45b601fe4694a5da5f SHA1 9478541d582586e60478e9d79d8cddba5bb082cf SHA256 2a55d50d761000277b37189d1f066bc20a334fbedab36d64ec442a8135d0322c
 AUX makefile_no-examples.diff 1420 RMD160 93a35e94233fc6030da206ca84dcf45c64569940 SHA1 a07b3a5bc1947f2bc88a61c601b896fd2937dabe SHA256 4afbb18c45cb99ab2556628d70679fd0f51c0dac890f611fffd975cdcc123172
-DIST libssh-0.1.tgz 122663 RMD160 dc195249bbf0e04390f0ecc88012e9b2f9be24fa SHA1 900d4af824bd01a21c4db7c3cc36789e3f8ab525 SHA256 d248ec8010a4c06bb6ae2ddc6243d6d9d9901f156b1976342207d12c7193b074
 DIST libssh-0.11.tgz 303761 RMD160 69c2cc00becb84a62555fe884345398f155815a4 SHA1 307430249ded90332c4ec77a264913b3bc93a648 SHA256 94ca32ac10615a7c0ba19180e67f2e40e2bfa4cc8de6ceb2a3a54d2dd83141cb
 DIST libssh-0.2.tgz 329371 RMD160 29b5d109f7962daa1f5e38197ff75b9603a39873 SHA1 bde7652da5a0f79127c3d5e4b9383d3a07619344 SHA256 46c3831fd563c54283ebef56e2cb11c27f47b1be9f6cb44f1465897dd7aea5ff
-EBUILD libssh-0.1.ebuild 828 RMD160 607388ea592812e0e471137e78fdc7868de466c3 SHA1 9e3b33cfff6dd75973b8ad860875a8072cdfa70e SHA256 478d1cc1ece9b6ea4ea9184de23d07f89c8c0e8ad95e1c620b35a2ff48116d5f
-EBUILD libssh-0.11.ebuild 614 RMD160 f67bc20ee98c97b542df730fc95c4c8674239440 SHA1 b03e60d6297baf313fc25c8ac273f4e4a3ae29c4 SHA256 8b92f772626ade83178413fd02b753bee00c5215e2d19f8bf61c0bda29307fee
-EBUILD libssh-0.2.ebuild 1039 RMD160 9bb17278c50bc3541ee675a8bba13c99a64f7837 SHA1 e896252d8a10d43b9584b9885535eef42ecbb63a SHA256 6a7bed132dc08b8b505417356db60bcee85a2695419851a60152a20fb021b1ee
-MISC ChangeLog 1423 RMD160 fc1e9ad227996cb3a5135bd34f2999801e95391c SHA1 eba47f04d3ddb02572e9947e6c78f41b0d959dd3 SHA256 3ea9ade64e3ec9453340d5099ee83147617ac50d677a90db55eddc9f0c6acde2
-MISC metadata.xml 252 RMD160 cbb7f92b846801124df255d4db434a58d3348f8f SHA1 dac5fb61ca5f27cb21960f25aa4e06bff89dd6b5 SHA256 554e2ee0303c5e4a8b0296d896a4496658465f1f90f5f74a9ba5c65aeec59caa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkldptcACgkQn/5bYzqsSmHAfgCgoJL/peoYhIWrXSaTfCqMdGHe
-oMkAoMFi1uQr06R0EnUgT1FIe8lnwML3
-=XA9N
------END PGP SIGNATURE-----
+DIST libssh-0.3.0.tar.gz 234813 RMD160 477f057a87485e913b46acc6c0615f43720d7f36 SHA1 446601b488dd11f3255b667e030eb4979fb9575f SHA256 d9a7575cd3dfcfcafd3a00c8b9f40baf981b7f2d6edbdd19ea4e6ff07a4a6bf5
+EBUILD libssh-0.1.1.ebuild 780 RMD160 db217af78a87a778d504cb5145b705fe59c99ef3 SHA1 7136647288ff810f2188aec67eabe578a02ef1b0 SHA256 91452fa27ee789f531803d77166f5fec9a3db114dc0c8e8f6bf0b760ff613f93
+EBUILD libssh-0.2.ebuild 1033 RMD160 70090f6578f3e6e1b9222f7adf0fdd5e16869530 SHA1 92739a8d2b5906ae02884013268dde3f1cd06fc5 SHA256 115acdc93780109290ad5d6dea462596b5c2f64ac551ac306d3c925e3b3fe6aa
+EBUILD libssh-0.3.0.ebuild 1188 RMD160 ec0650aabc73cbbd8f4964aab40762fd34a2e96e SHA1 23bf4bb342187146f1f0559eca2779f63ab6df68 SHA256 53913426d825fec6e9ddd1f9f78a5f5f0462cae29cc4d3168a60009f5c758f0e
+MISC ChangeLog 1904 RMD160 dbdaef9218b806296aedd2e096f19ff60982b8d7 SHA1 38c4c2d720f92c19e07588e4c752fffd92fe0a0a SHA256 fc8f89fc4b854b7cd70d4613ddb484b65660325aed2271fd4b6686f950fb602b
+MISC metadata.xml 542 RMD160 322eb088859fdb8d568a507c0b8a8f0c877cea7c SHA1 3e49f46f4c042c0ca5a1858d1e1f37cb2794576c SHA256 f7fbee555c0b3332e4e0887d3e8d0c748ec2117d83fe5d8e5a0f2e9462755b72
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>