| 1 |
xmw 12/05/02 22:13:39 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog mosh-1.2-r1.ebuild |
| 4 |
Log: |
| 5 |
Probide skalibs as fallback for old kernels |
| 6 |
|
| 7 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-misc/mosh/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/metadata.xml?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/metadata.xml?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/metadata.xml?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/mosh/metadata.xml,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- metadata.xml 6 Apr 2012 14:43:06 -0000 1.1 |
| 23 |
+++ metadata.xml 2 May 2012 22:13:39 -0000 1.2 |
| 24 |
@@ -10,6 +10,7 @@ |
| 25 |
<flag name="server">Build network server</flag> |
| 26 |
<flag name="examples">Include example scripts</flag> |
| 27 |
<flag name="utempter">Include libutempter support</flag> |
| 28 |
+<flag name="skalibs">Provide skalibs (esp. for old kernels)</flag> |
| 29 |
</use> |
| 30 |
<longdescription> |
| 31 |
Mosh is a remote terminal application that supports: |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.17 net-misc/mosh/ChangeLog |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/ChangeLog?rev=1.17&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/ChangeLog?rev=1.17&content-type=text/plain |
| 39 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/ChangeLog?r1=1.16&r2=1.17 |
| 40 |
|
| 41 |
Index: ChangeLog |
| 42 |
=================================================================== |
| 43 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v |
| 44 |
retrieving revision 1.16 |
| 45 |
retrieving revision 1.17 |
| 46 |
diff -u -r1.16 -r1.17 |
| 47 |
--- ChangeLog 2 May 2012 15:56:02 -0000 1.16 |
| 48 |
+++ ChangeLog 2 May 2012 22:13:39 -0000 1.17 |
| 49 |
@@ -1,6 +1,9 @@ |
| 50 |
# ChangeLog for net-misc/mosh |
| 51 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 52 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v 1.16 2012/05/02 15:56:02 xmw Exp $ |
| 53 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v 1.17 2012/05/02 22:13:39 xmw Exp $ |
| 54 |
+ |
| 55 |
+ 02 May 2012; Michael Weber <xmw@g.o> mosh-1.2-r1.ebuild, metadata.xml: |
| 56 |
+ Probide skalibs as fallback for old kernels |
| 57 |
|
| 58 |
*mosh-1.2-r1 (02 May 2012) |
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.2 net-misc/mosh/mosh-1.2-r1.ebuild |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/mosh-1.2-r1.ebuild?rev=1.2&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/mosh-1.2-r1.ebuild?rev=1.2&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/mosh-1.2-r1.ebuild?r1=1.1&r2=1.2 |
| 68 |
|
| 69 |
Index: mosh-1.2-r1.ebuild |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2-r1.ebuild,v |
| 72 |
retrieving revision 1.1 |
| 73 |
retrieving revision 1.2 |
| 74 |
diff -u -r1.1 -r1.2 |
| 75 |
--- mosh-1.2-r1.ebuild 2 May 2012 15:56:02 -0000 1.1 |
| 76 |
+++ mosh-1.2-r1.ebuild 2 May 2012 22:13:39 -0000 1.2 |
| 77 |
@@ -1,10 +1,10 @@ |
| 78 |
# Copyright 1999-2012 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2-r1.ebuild,v 1.1 2012/05/02 15:56:02 xmw Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2-r1.ebuild,v 1.2 2012/05/02 22:13:39 xmw Exp $ |
| 82 |
|
| 83 |
EAPI=4 |
| 84 |
|
| 85 |
-inherit autotools eutils toolchain-funcs |
| 86 |
+inherit autotools eutils linux-info toolchain-funcs |
| 87 |
|
| 88 |
DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" |
| 89 |
HOMEPAGE="http://mosh.mit.edu" |
| 90 |
@@ -13,7 +13,7 @@ |
| 91 |
LICENSE="GPL-3" |
| 92 |
SLOT="0" |
| 93 |
KEYWORDS="~amd64 ~x86" |
| 94 |
-IUSE="+client examples +server +utempter" |
| 95 |
+IUSE="+client examples +server skalibs +utempter" |
| 96 |
REQUIRED_USE="|| ( client server ) |
| 97 |
examples? ( client )" |
| 98 |
|
| 99 |
@@ -22,25 +22,52 @@ |
| 100 |
virtual/ssh |
| 101 |
client? ( dev-lang/perl |
| 102 |
dev-perl/IO-Tty ) |
| 103 |
+ skalibs? ( dev-libs/skalibs ) |
| 104 |
utempter? ( sys-libs/libutempter )" |
| 105 |
DEPEND="${RDEPEND} |
| 106 |
dev-util/pkgconfig" |
| 107 |
|
| 108 |
+pkg_setup() { |
| 109 |
+ if ! use skalibs ; then |
| 110 |
+ if kernel_is -gt 2 6 27 ; then |
| 111 |
+ ewarn |
| 112 |
+ ewarn "Consider activating the skalibs USE flag, iff the build fauls" |
| 113 |
+ ewarn |
| 114 |
+ fi |
| 115 |
+ fi |
| 116 |
+} |
| 117 |
+ |
| 118 |
src_prepare() { |
| 119 |
einfo remove bundled skalibs |
| 120 |
rm -r third || die |
| 121 |
- epatch "${FILESDIR}"/${PF}-remove-skalibs.patch |
| 122 |
- eautoreconf |
| 123 |
+ if use skalibs ; then |
| 124 |
+ epatch "${FILESDIR}"/${P}-shared-skalibs.patch |
| 125 |
+ eautoreconf |
| 126 |
+ epatch "${FILESDIR}"/${P}-shared-skalibs-fix-configure.patch |
| 127 |
+ else |
| 128 |
+ epatch "${FILESDIR}"/${PF}-remove-skalibs.patch |
| 129 |
+ eautoreconf |
| 130 |
+ fi |
| 131 |
} |
| 132 |
|
| 133 |
src_configure() { |
| 134 |
- econf \ |
| 135 |
+ local my_args="" |
| 136 |
+ if use skalibs ; then |
| 137 |
+ my_args=" --with-skalibs="${EPREFIX} |
| 138 |
+ my_args+=" --with-skalibs-include="${EPREFIX}/usr/include/skalibs |
| 139 |
+ my_args+=" --with-skalibs-libdir="${EPREFIX}/usr/$(get_libdir)/skalibs |
| 140 |
+ fi |
| 141 |
+ econf ${my_args} \ |
| 142 |
$(use_enable client) \ |
| 143 |
$(use_enable server) \ |
| 144 |
$(use_enable examples) \ |
| 145 |
$(use_with utempter) |
| 146 |
} |
| 147 |
|
| 148 |
+src_compile() { |
| 149 |
+ emake V=1 |
| 150 |
+} |
| 151 |
+ |
| 152 |
src_install() { |
| 153 |
default |
Archives