diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-11-28 02:35:04 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-11-28 02:35:04 +0000 |
| commit | 09d461eab2e49d4f17014a4c27fcdaaf6ffb6a48 (patch) | |
| tree | 4b64b79dc3eec15edbca0b91f1adda07914dea30 /net-libs/libssh2 | |
| parent | Fix autotools-utils usage (bug #392169). (diff) | |
| download | gentoo-2-09d461eab2e49d4f17014a4c27fcdaaf6ffb6a48.tar.gz gentoo-2-09d461eab2e49d4f17014a4c27fcdaaf6ffb6a48.tar.bz2 gentoo-2-09d461eab2e49d4f17014a4c27fcdaaf6ffb6a48.zip | |
Fix autotools-utils usage (bug #392167).
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libssh2')
| -rw-r--r-- | net-libs/libssh2/ChangeLog | 5 | ||||
| -rw-r--r-- | net-libs/libssh2/libssh2-1.3.0.ebuild | 24 |
2 files changed, 13 insertions, 16 deletions
diff --git a/net-libs/libssh2/ChangeLog b/net-libs/libssh2/ChangeLog index d875b51b7763..0ce17d537d7d 100644 --- a/net-libs/libssh2/ChangeLog +++ b/net-libs/libssh2/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-libs/libssh2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.45 2011/11/27 04:27:56 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.46 2011/11/28 02:35:04 radhermit Exp $ + + 28 Nov 2011; Tim Harder <radhermit@gentoo.org> libssh2-1.3.0.ebuild: + Fix autotools-utils usage (bug #392167). 27 Nov 2011; Tim Harder <radhermit@gentoo.org> libssh2-1.3.0.ebuild: Build in the source tree. diff --git a/net-libs/libssh2/libssh2-1.3.0.ebuild b/net-libs/libssh2/libssh2-1.3.0.ebuild index a99b44fb1034..5fae7d7485de 100644 --- a/net-libs/libssh2/libssh2-1.3.0.ebuild +++ b/net-libs/libssh2/libssh2-1.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.3.0.ebuild,v 1.6 2011/11/27 04:27:56 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.3.0.ebuild,v 1.7 2011/11/28 02:35:04 radhermit Exp $ EAPI="4" @@ -20,28 +20,22 @@ DEPEND="!gcrypt? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )" RDEPEND="${DEPEND}" -AUTOTOOLS_IN_SOURCE_BUILD=1 +DOCS=( README ) src_configure() { - local myconf + local myeconfargs if use gcrypt; then - myconf="--with-libgcrypt" + myeconfargs+=" --with-libgcrypt" else - myconf="--with-openssl" + myeconfargs+=" --with-openssl" fi # Disable tests that require extra permissions (bug #333319) use test && export ac_cv_path_SSHD= - econf \ - $(use_with zlib libz) \ - $(use_enable static-libs static) \ - ${myconf} -} - -src_install() { - default - dodoc README - use static-libs || remove_libtool_files + myeconfargs+=( + $(use_with zlib libz) + ) + autotools-utils_src_configure } |