Add latest RC into testing so it gets some attention. Does work with KDE 4.6.

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

4 files changed, 91 insertions, 9 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index 94f1476d0487..3e6f6af46b4d 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,12 @@
 # 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.42 2011/03/05 17:00:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.43 2011/03/28 11:14:42 scarabeus Exp $
+
+*libssh-0.4.91 (28 Mar 2011)
+
+  28 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> +libssh-0.4.91.ebuild,
+  libssh-9999.ebuild:
+  Add latest RC into testing so it gets some attention. Does work with KDE 4.6.
 
   05 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/libssh-0.3.0-automagic-crypt.patch, -libssh-0.4.1.ebuild,
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index c355b26af2b2..b2a8e656c10e 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libssh-0.4.8.tar.gz 277614 RMD160 1f2b31e7ff87fda102050d97ba5d10ea96b95b8d SHA1 97750c95389e425e10c9b1a8f8ce49667e7fbfe0 SHA256 15c239a426c7fbdddf97127ffddee6c4a5bcafac37f94987cf4f28cf218aa815
+DIST libssh-0.4.91.tar.gz 312078 RMD160 e9a58a31b49dc0310ce6e10a26336da975baa9d3 SHA1 61aff7b7e6c7d4a36ef68a58f47f216f7e5a019d SHA256 52d6a7202308de8df4c6bee2df56a5994eac2c64c4835407b64660632029d6e2
 EBUILD libssh-0.4.8.ebuild 1470 RMD160 1019596fcf9d2a56e0d407b0a041edc14f2094a5 SHA1 1b4f040d827f2c7cc1b88f555e37964f644f28aa SHA256 3faeacbb2cd3aca4b6b10ebcd2607843f318156112015cdf1423f60c518e8c9e
-EBUILD libssh-9999.ebuild 1334 RMD160 05ffacd7efb01f1903c7ac3ff6e36fe8de5d5c60 SHA1 5de92409e7afb2aac388549cc96c892bea0df3e2 SHA256 177295344d7f744b7abaaa068fc410572af7ea12415b4009b25a8a00f5d80519
-MISC ChangeLog 6191 RMD160 4eaca4255761127eb44b6362bc20f4c4e68c2371 SHA1 e11d38851ed9f135d3ecf3f724ce32ed8647e5bc SHA256 6e3a6bc7394467d4ba7cb2947aac02edbbc06870dcced76e6cee852c64f5fda7
+EBUILD libssh-0.4.91.ebuild 1548 RMD160 d484b3afcd4d2c4cb7461a2041ad7fb80808b98c SHA1 d8b16c754a4ca0fc16bc9011e5a982da1f3e97c8 SHA256 89c1cd9009b183d180acdbd90fa094a8d6c550cd59a5402aac269f341e3f5835
+EBUILD libssh-9999.ebuild 1474 RMD160 6d42a3837cbf79b9e085ff06ec9e6cda59a261f4 SHA1 0e15ffc221b8e5a20ae7b66d58b8b9c0e1986375 SHA256 0fed8e842e98fa83379cd204e6a53cf4ced5780efe8bbba9b2157e7a0745eae5
+MISC ChangeLog 6402 RMD160 ae97b77c8fdb47609af6b9f1c22e58b7efa0d3da SHA1 27be83c3fc8afb5d2086ebfa47270d93a1fc7a37 SHA256 8dfe93a377835ca654c80609317c5ab0f27ea09cc97cda1045f0c19706432f8c
 MISC metadata.xml 617 RMD160 62c9a2d4ef7d2d96b7d92d991955fabd7e852938 SHA1 3a3043b5b0684bb959008f0107957841cee6b4cb SHA256 cad0b9d4d822716fa2a55fde2b79b85456b83a555a07161190d3ad48400cae8c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2QbasACgkQHB6c3gNBRYf95ACfQt4sFszF3L3UPvCfS6+7FCzI
+LT8An3s3Kdup063bWkZPvV1SImhdM65w
+=cqoE
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libssh/libssh-0.4.91.ebuild b/net-libs/libssh/libssh-0.4.91.ebuild
new file mode 100644
index 000000000000..ebd4c0ab07be
--- /dev/null
+++ b/net-libs/libssh/libssh-0.4.91.ebuild
@@ -0,0 +1,59 @@
+# 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.91.ebuild,v 1.1 2011/03/28 11:14:42 scarabeus Exp $
+
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+EAPI=4
+
+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/rc/${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 examples gcrypt pcap +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() {
+	# just install the examples do not compile them
+	sed -i \
+		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	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 pcap)
+		$(cmake-utils_use_with server)
+		$(cmake-utils_use_with sftp)
+		$(cmake-utils_use_with ssh1)
+		$(cmake-utils_use_with static-libs STATIC_LIB)
+		$(cmake-utils_use_with zlib LIBZ)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins examples/*.{c,h,cpp}
+	fi
+}
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index cb2c2ae2f292..afb7bb0fbb69 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -1,8 +1,10 @@
 # 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.3 2011/02/21 15:09:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-9999.ebuild,v 1.4 2011/03/28 11:14:42 scarabeus Exp $
 
-EAPI=3
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+EAPI=4
 
 inherit eutils cmake-utils git
 
@@ -13,7 +15,7 @@ EGIT_REPO_URI="git://git.libssh.org/projects/libssh.git"
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 SLOT="0"
-IUSE="debug gcrypt examples +sftp ssh1 server static-libs zlib"
+IUSE="debug examples gcrypt pcap +sftp ssh1 server static-libs zlib"
 
 DEPEND="
 	zlib? ( >=sys-libs/zlib-1.2 )
@@ -22,10 +24,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=(AUTHORS README ChangeLog)
+DOCS=( AUTHORS README ChangeLog )
 
 src_prepare() {
-	sed -i '/add_subdirectory(examples)/s/^/#DONOTWANT/' CMakeLists.txt
+	# just install the examples do not compile them
+	sed -i \
+		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+		CMakeLists.txt || die
 }
 
 src_configure() {
@@ -49,6 +54,6 @@ src_install() {
 
 	if use examples; then
 		insinto /usr/share/doc/"${PF}"/examples
-		doins examples/*.c
+		doins examples/*.{c,h,cpp}
 	fi
 }