diff options
| -rw-r--r-- | net-libs/libssh2/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch | 4 | ||||
| -rw-r--r-- | net-libs/libssh2/libssh2-1.4.2.ebuild | 43 |
3 files changed, 7 insertions, 46 deletions
diff --git a/net-libs/libssh2/ChangeLog b/net-libs/libssh2/ChangeLog index 85bf80accdb1..49cd2f548ae4 100644 --- a/net-libs/libssh2/ChangeLog +++ b/net-libs/libssh2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/libssh2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.86 2014/06/18 20:38:50 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.87 2014/07/18 15:38:02 jer Exp $ + + 18 Jul 2014; Jeroen Roovers <jer@gentoo.org> -libssh2-1.4.2.ebuild, + files/libssh2-1.4.2-pkgconfig.patch: + Clean up patch. 18 Jun 2014; Michał Górny <mgorny@gentoo.org> libssh2-1.4.3-r1.ebuild: Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug diff --git a/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch b/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch index 813e045da625..f741a256f7cd 100644 --- a/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch +++ b/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch @@ -1,5 +1,5 @@ ---- libssh2-1.4.2/libssh2.pc.in -+++ libssh2-1.4.2/libssh2.pc.in +--- a/libssh2.pc.in ++++ b/libssh2.pc.in @@ -12,6 +12,6 @@ Description: Library for SSH-based communication Version: @LIBSSH2VER@ diff --git a/net-libs/libssh2/libssh2-1.4.2.ebuild b/net-libs/libssh2/libssh2-1.4.2.ebuild deleted file mode 100644 index 635285e0e969..000000000000 --- a/net-libs/libssh2/libssh2-1.4.2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.4.2.ebuild,v 1.10 2014/03/01 22:37:05 mgorny Exp $ - -EAPI="4" - -inherit autotools-utils - -DESCRIPTION="Library implementing the SSH2 protocol" -HOMEPAGE="http://www.libssh2.org/" -SRC_URI="http://www.${PN}.org/download/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -IUSE="gcrypt static-libs test zlib" - -DEPEND="!gcrypt? ( dev-libs/openssl ) - gcrypt? ( dev-libs/libgcrypt:0 ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -DOCS=( README ) - -PATCHES=( "${FILESDIR}"/${P}-pkgconfig.patch ) - -src_configure() { - local myeconfargs - - if use gcrypt; then - myeconfargs+=" --with-libgcrypt" - else - myeconfargs+=" --with-openssl" - fi - - # Disable tests that require extra permissions (bug #333319) - use test && export ac_cv_path_SSHD= - - myeconfargs+=( - $(use_with zlib libz) - ) - autotools-utils_src_configure -} |