mgorny 14/06/18 17:35:12 Modified: libssh-9999.ebuild ChangeLog Log: Update the live ebuild. Use git-r3. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.7 net-libs/libssh/libssh-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/libssh-9999.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/libssh-9999.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/libssh-9999.ebuild?r1=1.6&r2=1.7 Index: libssh-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-9999.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libssh-9999.ebuild 20 Dec 2013 14:33:33 -0000 1.6 +++ libssh-9999.ebuild 18 Jun 2014 17:35:12 -0000 1.7 @@ -1,12 +1,10 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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.6 2013/12/20 14:33:33 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-9999.ebuild,v 1.7 2014/06/18 17:35:12 mgorny Exp $ -# Maintainer: check IUSE-defaults at DefineOptions.cmake - -EAPI=4 +EAPI=5 -inherit eutils cmake-utils git-2 +inherit eutils cmake-multilib multilib git-r3 DESCRIPTION="Access a working SSH implementation by means of a library" HOMEPAGE="http://www.libssh.org/"; @@ -15,44 +13,70 @@ LICENSE="LGPL-2.1" KEYWORDS="" SLOT="0" -IUSE="debug examples pcap +sftp ssh1 server static-libs zlib" +IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib" +# Maintainer: check IUSE-defaults at DefineOptions.cmake -DEPEND=" - zlib? ( >=sys-libs/zlib-1.2 ) - >=dev-libs/openssl-0.9.8 +RDEPEND=" + zlib? ( >=sys-libs/zlib-1.2[${MULTILIB_USEDEP}] ) + !gcrypt? ( >=dev-libs/openssl-0.9.8[${MULTILIB_USEDEP}] ) + gcrypt? ( >=dev-libs/libgcrypt-1.5:0[${MULTILIB_USEDEP}] ) + gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + test? ( dev-util/cmocka[${MULTILIB_USEDEP}] ) " -RDEPEND="${DEPEND}" DOCS=( AUTHORS README ChangeLog ) +EGIT_MIN_CLONE_TYPE=single + src_prepare() { # just install the examples do not compile them sed -i \ -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \ CMakeLists.txt || die + + cmake-utils_src_prepare } -src_configure() { +multilib_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 gssapi) $(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) - -DWITH_GCRYPT=OFF + $(cmake-utils_use_with test STATIC_LIB) + $(cmake-utils_use_with test TESTING) + $(cmake-utils_use_with zlib) ) cmake-utils_src_configure } -src_install() { +multilib_src_compile() { + cmake-utils_src_compile + multilib_is_native_abi && use doc && cmake-utils_src_compile doc +} + +multilib_src_install() { cmake-utils_src_install + multilib_is_native_abi && use doc && dohtml -r doc/html/. + + use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a +} + +multilib_src_install_all() { + einstalldocs + if use examples; then - insinto /usr/share/doc/"${PF}"/examples - doins examples/*.{c,h,cpp} + docinto examples + dodoc examples/*.{c,h,cpp} fi } 1.107 net-libs/libssh/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/ChangeLog?rev=1.107&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/ChangeLog?rev=1.107&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libssh/ChangeLog?r1=1.106&r2=1.107 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- ChangeLog 11 Jun 2014 19:53:45 -0000 1.106 +++ ChangeLog 18 Jun 2014 17:35:12 -0000 1.107 @@ -1,6 +1,9 @@ # ChangeLog for net-libs/libssh # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.106 2014/06/11 19:53:45 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.107 2014/06/18 17:35:12 mgorny Exp $ + + 18 Jun 2014; Michał Górny <mgo...@gentoo.org> libssh-9999.ebuild: + Update the live ebuild. Use git-r3. *libssh-0.6.3-r1 (11 Jun 2014)
