Remove skalibs from build.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 86 insertions, 1 deletions

diff --git a/net-misc/mosh/ChangeLog b/net-misc/mosh/ChangeLog
index dd03f652b9b6..9a944da5a59a 100644
--- a/net-misc/mosh/ChangeLog
+++ b/net-misc/mosh/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2012/05/01 09:04:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v 1.16 2012/05/02 15:56:02 xmw Exp $
+
+*mosh-1.2-r1 (02 May 2012)
+
+  02 May 2012; Michael Weber <xmw@gentoo.org> +mosh-1.2-r1.ebuild,
+  +files/mosh-1.2-r1-remove-skalibs.patch:
+  Remove skalibs from build.
 
   01 May 2012; Michael Weber <xmw@gentoo.org> mosh-1.2.ebuild,
   +files/mosh-1.2-shared-skalibs.patch,
diff --git a/net-misc/mosh/files/mosh-1.2-r1-remove-skalibs.patch b/net-misc/mosh/files/mosh-1.2-r1-remove-skalibs.patch
new file mode 100644
index 000000000000..763048cfc6af
--- /dev/null
+++ b/net-misc/mosh/files/mosh-1.2-r1-remove-skalibs.patch
@@ -0,0 +1,28 @@
+--- mosh-1.2/configure.ac
++++ mosh-1.2/configure.ac
+@@ -178,7 +178,7 @@
+ STDDJB_LDFLAGS=""
+ AS_IF([test x"$with_skalibs" != xno],
+   [AX_CHECK_LIBRARY([SKALIBS], [selfpipe.h], [stddjb], [],
+-     [AC_MSG_ERROR([Unable to find skalibs.])])
++     [AC_MSG_WARN([Unable to find skalibs.])])
+    AC_SUBST([STDDJB_CPPFLAGS], ["$SKALIBS_CPPFLAGS"])
+    AC_SUBST([STDDJB_LDFLAGS], ["$SKALIBS_LDFLAGS -lstddjb"])])
+ 
+@@ -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/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-r1.ebuild b/net-misc/mosh/mosh-1.2-r1.ebuild
new file mode 100644
index 000000000000..da96d8c22271
--- /dev/null
+++ b/net-misc/mosh/mosh-1.2-r1.ebuild
@@ -0,0 +1,51 @@
+# 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 $
+
+EAPI=4
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
+HOMEPAGE="http://mosh.mit.edu"
+SRC_URI="https://github.com/downloads/keithw/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client examples +server +utempter"
+REQUIRED_USE="|| ( client server )
+	examples? ( client )"
+
+RDEPEND="dev-libs/protobuf
+	sys-libs/ncurses:5
+	virtual/ssh
+	client? ( dev-lang/perl
+		dev-perl/IO-Tty )
+	utempter? ( sys-libs/libutempter )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	einfo remove bundled skalibs
+	rm -r third || die
+	epatch "${FILESDIR}"/${PF}-remove-skalibs.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable client) \
+		$(use_enable server) \
+		$(use_enable examples) \
+		$(use_with utempter)
+}
+
+src_install() {
+	default
+
+	for myprog in $(find src/examples -type f -perm /0111) ; do
+		newbin ${myprog} ${PN}-$(basename ${myprog})
+		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
+	done
+}