Fix prefix build.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

4 files changed, 84 insertions, 9 deletions

diff --git a/net-misc/mosh/ChangeLog b/net-misc/mosh/ChangeLog
index 5cac3e5d366e..dd03f652b9b6 100644
--- a/net-misc/mosh/ChangeLog
+++ b/net-misc/mosh/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2012/04/30 22:19:41 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v 1.15 2012/05/01 09:04:26 xmw Exp $
+
+  01 May 2012; Michael Weber <xmw@gentoo.org> mosh-1.2.ebuild,
+  +files/mosh-1.2-shared-skalibs.patch,
+  +files/mosh-1.2-shared-skalibs-fix-configure.patch:
+  Fix prefix build.
 
   30 Apr 2012; Michael Weber <xmw@gentoo.org> -mosh-1.1.95.ebuild:
   Remove old version
diff --git a/net-misc/mosh/files/mosh-1.2-shared-skalibs-fix-configure.patch b/net-misc/mosh/files/mosh-1.2-shared-skalibs-fix-configure.patch
new file mode 100644
index 000000000000..498967f94fae
--- /dev/null
+++ b/net-misc/mosh/files/mosh-1.2-shared-skalibs-fix-configure.patch
@@ -0,0 +1,10 @@
+--- mosh-1.2/configure
++++ mosh-1.2/configure
+@@ -6147,6 +6147,7 @@
+   ;
+   return 0;
+ }
++char const * PROG = "mosh-test";
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_stddjb_main=yes
diff --git a/net-misc/mosh/files/mosh-1.2-shared-skalibs.patch b/net-misc/mosh/files/mosh-1.2-shared-skalibs.patch
new file mode 100644
index 000000000000..c22a77410e38
--- /dev/null
+++ b/net-misc/mosh/files/mosh-1.2-shared-skalibs.patch
@@ -0,0 +1,61 @@
+--- mosh-1.2/configure.ac
++++ mosh-1.2/configure.ac
+@@ -163,7 +163,7 @@
+   [with_skalibs=$withval
+    AS_IF([test x"$withval" != xyes],
+      [SKALIBS_CPPFLAGS="-I$withval/include"
+-      SKALIBS_LDFLAGS="-L$withval/lib"])],
++      SKALIBS_LDFLAGS="-L$withval/lib -lrt"])],
+   [with_skalibs=no])
+ AC_ARG_WITH([skalibs-include],
+   [AS_HELP_STRING([--with-skalibs-include=DIR],
+@@ -172,7 +172,7 @@
+ AC_ARG_WITH([skalibs-libdir],
+   [AS_HELP_STRING([--with-skalibs-libdir=DIR],
+      [specify exact library dir for skalibs libraries])],
+-  [SKALIBS_LDFLAGS="-L$withval"])
++  [SKALIBS_LDFLAGS="-L$withval -lrt"])
+ 
+ STDDJB_CPPFLAGS=""
+ STDDJB_LDFLAGS=""
+@@ -360,9 +360,6 @@
+ 
+ AC_CONFIG_FILES([
+   Makefile
+-  third/Makefile
+-  third/libstddjb/Makefile
+-  third/poll/Makefile
+   src/Makefile
+   src/crypto/Makefile
+   src/frontend/Makefile
+--- mosh-1.2/src/frontend/mosh-server.cc
++++ mosh-1.2/src/frontend/mosh-server.cc
+@@ -750,3 +750,5 @@
+   struct stat buf;
+   return (0 == lstat( ".hushlogin", &buf ));
+ }
++
++char const * PROG = "mosh-server" ;
+--- mosh-1.2/src/frontend/mosh-client.cc
++++ mosh-1.2/src/frontend/mosh-client.cc
+@@ -140,3 +140,5 @@
+ 
+   return 0;
+ }
++
++char const * PROG = "mosh-client" ;
+--- mosh-1.2/src/examples/termemu.cc
++++ mosh-1.2/src/examples/termemu.cc
+@@ -324,3 +324,5 @@
+ 
+   swrite( STDOUT_FILENO, Terminal::Emulator::close().c_str() );
+ }
++
++char const * PROG = "termemu" ;
+--- mosh-1.2/Makefile.am
++++ mosh-1.2/Makefile.am
+@@ -1,3 +1,3 @@
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = third src scripts man
++SUBDIRS = src scripts man
+ EXTRA_DIST = autogen.sh ocb-license.html README.md
diff --git a/net-misc/mosh/mosh-1.2.ebuild b/net-misc/mosh/mosh-1.2.ebuild
index aa2546edf353..6d28d83f0669 100644
--- a/net-misc/mosh/mosh-1.2.ebuild
+++ b/net-misc/mosh/mosh-1.2.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.ebuild,v 1.1 2012/04/26 07:58:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.ebuild,v 1.2 2012/05/01 09:04:26 xmw Exp $
 
 EAPI=4
 
-inherit autotools toolchain-funcs
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
 HOMEPAGE="http://mosh.mit.edu"
@@ -30,17 +30,16 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	einfo remove bundled skalibs
 	rm -r third || die
-	sed -e '/third/d' -i configure.ac
-	sed -e '/^SUBDIRS/s: third : :' -i Makefile.am
-
+	epatch "${FILESDIR}"/${P}-shared-skalibs.patch
 	eautoreconf
+	epatch "${FILESDIR}"/${P}-shared-skalibs-fix-configure.patch
 }
 
 src_configure() {
 	econf \
-		--with-skalibs=/ \
-		--with-skalibs-include=/usr/include/skalibs \
-		--with-skalibs-libdir=/usr/$(get_libdir)/skalibs \
+		--with-skalibs="${EPREFIX}"/ \
+		--with-skalibs-include="${EPREFIX}"/usr/include/skalibs \
+		--with-skalibs-libdir="${EPREFIX}"/usr/$(get_libdir)/skalibs \
 		$(use_enable client) \
 		$(use_enable server) \
 		$(use_enable examples) \