diff options
| author |   Michael Weber <xmw@gentoo.org> | 2012-05-02 22:13:39 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2012-05-02 22:13:39 +0000 |
| commit | 0bfde7dcfc7b922b752ffe610acd7cf2d7e22bee (patch) | |
| tree | d2ad904db091cc44652bc9ffb070698953117743 /net-misc/mosh | |
| parent | Version bump #414413 by Ulrich Müller. (diff) | |
| download | gentoo-2-0bfde7dcfc7b922b752ffe610acd7cf2d7e22bee.tar.gz gentoo-2-0bfde7dcfc7b922b752ffe610acd7cf2d7e22bee.tar.bz2 gentoo-2-0bfde7dcfc7b922b752ffe610acd7cf2d7e22bee.zip | |
Probide skalibs as fallback for old kernels
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/mosh')
| -rw-r--r-- | net-misc/mosh/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/mosh/metadata.xml | 1 | ||||
| -rw-r--r-- | net-misc/mosh/mosh-1.2-r1.ebuild | 39 |
3 files changed, 38 insertions, 7 deletions
diff --git a/net-misc/mosh/ChangeLog b/net-misc/mosh/ChangeLog index 9a944da5a59a..1d7c72e47571 100644 --- a/net-misc/mosh/ChangeLog +++ b/net-misc/mosh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/mosh # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v 1.16 2012/05/02 15:56:02 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v 1.17 2012/05/02 22:13:39 xmw Exp $ + + 02 May 2012; Michael Weber <xmw@gentoo.org> mosh-1.2-r1.ebuild, metadata.xml: + Probide skalibs as fallback for old kernels *mosh-1.2-r1 (02 May 2012) diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml index b1d90a440435..652bdb304787 100644 --- a/net-misc/mosh/metadata.xml +++ b/net-misc/mosh/metadata.xml @@ -10,6 +10,7 @@ <flag name="server">Build network server</flag> <flag name="examples">Include example scripts</flag> <flag name="utempter">Include libutempter support</flag> +<flag name="skalibs">Provide skalibs (esp. for old kernels)</flag> </use> <longdescription> Mosh is a remote terminal application that supports: diff --git a/net-misc/mosh/mosh-1.2-r1.ebuild b/net-misc/mosh/mosh-1.2-r1.ebuild index da96d8c22271..1f299b959803 100644 --- a/net-misc/mosh/mosh-1.2-r1.ebuild +++ b/net-misc/mosh/mosh-1.2-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2-r1.ebuild,v 1.1 2012/05/02 15:56:02 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2-r1.ebuild,v 1.2 2012/05/02 22:13:39 xmw Exp $ EAPI=4 -inherit autotools eutils toolchain-funcs +inherit autotools eutils linux-info toolchain-funcs DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" HOMEPAGE="http://mosh.mit.edu" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/downloads/keithw/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+client examples +server +utempter" +IUSE="+client examples +server skalibs +utempter" REQUIRED_USE="|| ( client server ) examples? ( client )" @@ -22,25 +22,52 @@ RDEPEND="dev-libs/protobuf virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) + skalibs? ( dev-libs/skalibs ) utempter? ( sys-libs/libutempter )" DEPEND="${RDEPEND} dev-util/pkgconfig" +pkg_setup() { + if ! use skalibs ; then + if kernel_is -gt 2 6 27 ; then + ewarn + ewarn "Consider activating the skalibs USE flag, iff the build fauls" + ewarn + fi + fi +} + src_prepare() { einfo remove bundled skalibs rm -r third || die - epatch "${FILESDIR}"/${PF}-remove-skalibs.patch - eautoreconf + if use skalibs ; then + epatch "${FILESDIR}"/${P}-shared-skalibs.patch + eautoreconf + epatch "${FILESDIR}"/${P}-shared-skalibs-fix-configure.patch + else + epatch "${FILESDIR}"/${PF}-remove-skalibs.patch + eautoreconf + fi } src_configure() { - econf \ + local my_args="" + if use skalibs ; then + my_args=" --with-skalibs="${EPREFIX} + my_args+=" --with-skalibs-include="${EPREFIX}/usr/include/skalibs + my_args+=" --with-skalibs-libdir="${EPREFIX}/usr/$(get_libdir)/skalibs + fi + econf ${my_args} \ $(use_enable client) \ $(use_enable server) \ $(use_enable examples) \ $(use_with utempter) } +src_compile() { + emake V=1 +} + src_install() { default |