From 4aa1145eb0db6137f87a2c298a1bd01058e0d7ba Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sun, 13 Dec 2009 22:18:37 +0000 Subject: Version bump (required for KDE 4.4_beta). Drop old. Stable on amd64. (Portage version: 2.2_rc59/cvs/Linux x86_64) --- net-libs/libssh/ChangeLog | 8 +++++- net-libs/libssh/libssh-0.1.1.ebuild | 27 ------------------ net-libs/libssh/libssh-0.3.4.ebuild | 4 +-- net-libs/libssh/libssh-0.4.0.ebuild | 55 +++++++++++++++++++++++++++++++++++++ net-libs/libssh/metadata.xml | 1 + 5 files changed, 65 insertions(+), 30 deletions(-) delete mode 100644 net-libs/libssh/libssh-0.1.1.ebuild create mode 100644 net-libs/libssh/libssh-0.4.0.ebuild (limited to 'net-libs/libssh') 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 -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 -files/makefile_no-examples.diff: 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 @@ netmon +kde access a working SSH implementation by means of a library Prefer dev-libs/libgcrypt over -- cgit v1.2.3-65-gdbad