Version bump (required for KDE 4.4_beta). Drop old. Stable on amd64.

Package-Manager: portage-2.2_rc59/cvs/Linux x86_64

6 files changed, 70 insertions, 35 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index 51a85a286aa4..1e11a145f1fa 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libssh
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.21 2009/11/19 15:37:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.22 2009/12/13 22:18:37 scarabeus Exp $
+
+*libssh-0.4.0 (13 Dec 2009)
+
+  13 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -libssh-0.1.1.ebuild,
+  libssh-0.3.4.ebuild, +libssh-0.4.0.ebuild, metadata.xml:
+  Version bump (required for KDE 4.4_beta). Drop old. Stable on amd64.
 
   19 Nov 2009; Jeroen Roovers <jer@gentoo.org>
   -files/makefile_no-examples.diff:
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index f360a3b41b5e..b985b3f430ad 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,7 +1,7 @@
 AUX libssh-0.3.0-automagic-crypt.patch 980 RMD160 2085b57b9569d0a96fb31e45b601fe4694a5da5f SHA1 9478541d582586e60478e9d79d8cddba5bb082cf SHA256 2a55d50d761000277b37189d1f066bc20a334fbedab36d64ec442a8135d0322c
-DIST libssh-0.11.tgz 303761 RMD160 69c2cc00becb84a62555fe884345398f155815a4 SHA1 307430249ded90332c4ec77a264913b3bc93a648 SHA256 94ca32ac10615a7c0ba19180e67f2e40e2bfa4cc8de6ceb2a3a54d2dd83141cb
 DIST libssh-0.3.4.tar.gz 224320 RMD160 cbcd4a60180dca7f2ccb4c665f37a5fff4630ddd SHA1 abded99e80706ae8d50f5f25e1a3eed3c909513d SHA256 d22477fa90252bf615fd0755c44006a2f9223d9da6fa04e00fa398e4a2c15761
-EBUILD libssh-0.1.1.ebuild 782 RMD160 4061beb60c8ee0907170fa74b519cc9fb6266899 SHA1 643c4429321ad8ecb13cadb0ca910d0902f90e75 SHA256 16ee1aaacf6ad503f69a40cc72c9d02b6962ad157fa0440ff361963799b0ca71
-EBUILD libssh-0.3.4.ebuild 1321 RMD160 0b991cc76edbe3d7c99d1d8d67006e6476a3c8b7 SHA1 408be08c58f9944acd650b7f4990d90f8f7f94b9 SHA256 4f997e57e5bb05ebf7755fcf61ba0fe2bb5a92282d831a11debd5f1fc076a7fc
-MISC ChangeLog 2968 RMD160 8772d07758e9579d5432f78d3855148cee233b49 SHA1 5ef48de9554ac3f322b354fab281089c3d82b682 SHA256 0b8675eb10882430bf3c9864a361eebcffc6698950b3c1e4d88cb84a8c170038
-MISC metadata.xml 542 RMD160 322eb088859fdb8d568a507c0b8a8f0c877cea7c SHA1 3e49f46f4c042c0ca5a1858d1e1f37cb2794576c SHA256 f7fbee555c0b3332e4e0887d3e8d0c748ec2117d83fe5d8e5a0f2e9462755b72
+DIST libssh-0.4.0.tar.gz 250094 RMD160 35835e2f9fa2ec53e71396d4ac2c54d951c122e1 SHA1 88f2021d2dfdb5c9521d99840b5ed8035a0ee5c3 SHA256 95093117de68c163901ef99441e3e5d7c343fcc60d0651195870df3af4c5a5d5
+EBUILD libssh-0.3.4.ebuild 1323 RMD160 1eab71f719d1117749b795314b47d66417f9b061 SHA1 06accd1cbbd10a975fe7eeb3c91edaef30bd651a SHA256 67ad812676a207574aed255c1cbd2690b0698fc0527179ec493a2c730b43454a
+EBUILD libssh-0.4.0.ebuild 1376 RMD160 8f0e778928be251591d0c10022cb70a6e9bc28ae SHA1 48aa97dffd26036973a76d512069ca68a208932d SHA256 3b2a6d3cc03706ea8dd5fa06d8090b88c5e49e9e7a9c7edb468659ad9ef14d34
+MISC ChangeLog 3211 RMD160 3a3417cf72c0b9151b07e59cf83c77d0829d47c2 SHA1 2567427c7b87a7e418ea1ced236ac85c9c7011d2 SHA256 08c0fe4828b3c13cd5e322f1bc4a9007c9da5d2253f4bb061461d09fbb3409ac
+MISC metadata.xml 559 RMD160 0bc9f16adf17bb774237c98c1af90c237b760ade SHA1 6844c70e29f6748e20c31910baca90fccdf4580b SHA256 a25c0bbdca0f3e47fdfada437058491fce17c4a828b5a96ff7fe73260623eb83
diff --git a/net-libs/libssh/libssh-0.1.1.ebuild b/net-libs/libssh/libssh-0.1.1.ebuild
deleted file mode 100644
index 533b88ce1250..000000000000
--- a/net-libs/libssh/libssh-0.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.1.1.ebuild,v 1.4 2009/11/12 19:14:56 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/${MY_P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~x86"
-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"
-	chmod a-x "${D}"/usr/include/libssh/*
-}
diff --git a/net-libs/libssh/libssh-0.3.4.ebuild b/net-libs/libssh/libssh-0.3.4.ebuild
index 4a6127ca2807..b525b146ac60 100644
--- a/net-libs/libssh/libssh-0.3.4.ebuild
+++ b/net-libs/libssh/libssh-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.3 2009/10/24 12:43:58 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.3.4.ebuild,v 1.4 2009/12/13 22:18:37 scarabeus Exp $
 
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.libssh.org/"
 SRC_URI="http://www.libssh.org/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ppc ~s390 x86"
+KEYWORDS="amd64 ppc ~s390 x86"
 SLOT="0"
 IUSE="debug gcrypt examples +sftp ssh1 server static-libs zlib"
 
diff --git a/net-libs/libssh/libssh-0.4.0.ebuild b/net-libs/libssh/libssh-0.4.0.ebuild
new file mode 100644
index 000000000000..f94095604c74
--- /dev/null
+++ b/net-libs/libssh/libssh-0.4.0.ebuild
@@ -0,0 +1,55 @@
+# 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.4.0.ebuild,v 1.1 2009/12/13 22:18:37 scarabeus 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.${PN}.org/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~s390 ~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"
+
+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 "${ROOT}"usr/share/doc/"${PF}"/examples
+		doins examples/*.c
+	fi
+}
diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index 1d3e62aa8869..a768afd2e3a0 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+<herd>kde</herd>
 <longdescription>access a working SSH implementation by means of a library</longdescription>
 <use>
   <flag name='gcrypt'>Prefer <pkg>dev-libs/libgcrypt</pkg> over