diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-09-22 16:43:32 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-09-22 16:43:32 +0000 |
| commit | ccb046899753168b850315a2f6ff378c01805a7b (patch) | |
| tree | bdea1e3e856f2f6d0ac3a46f555f736e5bc99f65 | |
| parent | Version bump wrt #484702 by "teidakankan" (diff) | |
| download | gentoo-2-ccb046899753168b850315a2f6ff378c01805a7b.tar.gz gentoo-2-ccb046899753168b850315a2f6ff378c01805a7b.tar.bz2 gentoo-2-ccb046899753168b850315a2f6ff378c01805a7b.zip | |
Pick the correct libdir by Nikoli (bug #485600 again).
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key A792A613)
| -rw-r--r-- | net-libs/libssh/ChangeLog | 5 | ||||
| -rw-r--r-- | net-libs/libssh/libssh-0.5.5.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog index 693bab70c2db..fbf3c1ba2237 100644 --- a/net-libs/libssh/ChangeLog +++ b/net-libs/libssh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-libs/libssh # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.84 2013/09/22 15:04:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.85 2013/09/22 16:43:32 jer Exp $ + + 22 Sep 2013; Jeroen Roovers <jer@gentoo.org> libssh-0.5.5.ebuild: + Pick the correct libdir by Nikoli (bug #485600 again). 22 Sep 2013; Jeroen Roovers <jer@gentoo.org> libssh-0.5.5.ebuild: Remove static libraries when USE=test (bug #485600 by Nikoli). diff --git a/net-libs/libssh/libssh-0.5.5.ebuild b/net-libs/libssh/libssh-0.5.5.ebuild index 28bf2a47f868..c45a801b14aa 100644 --- a/net-libs/libssh/libssh-0.5.5.ebuild +++ b/net-libs/libssh/libssh-0.5.5.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.5.5.ebuild,v 1.6 2013/09/22 15:04:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.5.5.ebuild,v 1.7 2013/09/22 16:43:32 jer Exp $ EAPI=5 -inherit eutils cmake-utils +inherit eutils cmake-utils multilib DESCRIPTION="Access a working SSH implementation by means of a library" HOMEPAGE="http://www.libssh.org/" @@ -66,7 +66,7 @@ src_install() { use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/* - use static-libs || rm -f "${D}"/usr/lib64/libssh{,_threads}.a + use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a if use examples; then docinto examples |