Version bump, new USE flags.

(Portage version: 2.1.10.62/cvs/Linux x86_64)

5 files changed, 97 insertions, 12 deletions

diff --git a/net-misc/mosh/ChangeLog b/net-misc/mosh/ChangeLog
index 990d2101f80f..dfcc0b7af6b9 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.20 2012/05/23 08:38:15 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v 1.21 2012/05/23 22:27:31 xmw Exp $
+
+*mosh-1.2.0.97 (23 May 2012)
+
+  23 May 2012; Michael Weber <xmw@gentoo.org> mosh-1.2.0.95.ebuild,
+  +mosh-1.2.0.97.ebuild, mosh-9999.ebuild:
+  Version bump, new USE flags.
 
 *mosh-1.2.0.95 (23 May 2012)
 
diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index 652bdb304787..5bcf39e9d431 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
 </maintainer>
 <use>
-<flag name="client">Build network client</flag>
-<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>
+	<flag name="client">Build network client</flag>
+	<flag name="server">Build network server</flag>
+	<flag name="examples">Include example scripts</flag>
+	<flag name="ufw">Install net-firewall/ufw rule set</flag>
+	<flag name="utempter">Include libutempter support</flag>
 </use>
 <longdescription>
 Mosh is a remote terminal application that supports:
@@ -19,5 +19,8 @@ Mosh is a remote terminal application that supports:
   - intelligent local echo and line editing to reduce the effects
     of "network lag" on high-latency connections.
 </longdescription>
+<upstream>
+	<bugs-to>https://github.com/keithw/mosh/issues</bugs-to>
+</upstream>
 </pkgmetadata>
 
diff --git a/net-misc/mosh/mosh-1.2.0.95.ebuild b/net-misc/mosh/mosh-1.2.0.95.ebuild
index 77b0f870e536..281f93626118 100644
--- a/net-misc/mosh/mosh-1.2.0.95.ebuild
+++ b/net-misc/mosh/mosh-1.2.0.95.ebuild
@@ -1,6 +1,6 @@
 # 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.0.95.ebuild,v 1.1 2012/05/23 08:38:15 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.0.95.ebuild,v 1.2 2012/05/23 22:27:31 xmw Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ 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"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-misc/mosh/mosh-1.2.0.97.ebuild b/net-misc/mosh/mosh-1.2.0.97.ebuild
new file mode 100644
index 000000000000..623b9780b468
--- /dev/null
+++ b/net-misc/mosh/mosh-1.2.0.97.ebuild
@@ -0,0 +1,62 @@
+# 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.0.97.ebuild,v 1.1 2012/05/23 22:27:31 xmw Exp $
+
+EAPI=4
+
+inherit autotools 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="bash-completion +client examples +server ufw +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}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable test tests) \
+		$(use_enable bash-completion completion) \
+		$(use_enable client) \
+		$(use_enable server) \
+		$(use_enable examples) \
+		$(use_enable ufw) \
+		$(use_with utempter)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	einfo "running test encrypt-decrypt"
+	./src/tests/encrypt-decrypt -q || die
+	einfo "running test ocb-aes"
+	./src/tests/ocb-aes -q || die
+}
+
+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
+}
diff --git a/net-misc/mosh/mosh-9999.ebuild b/net-misc/mosh/mosh-9999.ebuild
index 5cfdad25fe1d..960d28ecc9f4 100644
--- a/net-misc/mosh/mosh-9999.ebuild
+++ b/net-misc/mosh/mosh-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.8 2012/05/19 08:05:36 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-9999.ebuild,v 1.9 2012/05/23 22:27:31 xmw Exp $
 
 EAPI=4
 EGIT_REPO_URI="https://github.com/keithw/mosh.git"
@@ -13,7 +13,7 @@ HOMEPAGE="http://mosh.mit.edu"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="+client examples +server +utempter"
+IUSE="bash-completion +client examples +server ufw +utempter"
 REQUIRED_USE="|| ( client server )
 	examples? ( client )"
 
@@ -32,12 +32,26 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		$(use_enable test tests) \
+		$(use_enable bash-completion completion) \
 		$(use_enable client) \
 		$(use_enable server) \
 		$(use_enable examples) \
+		$(use_enable ufw) \
 		$(use_with utempter)
 }
 
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	einfo "running test encrypt-decrypt"
+	./src/tests/encrypt-decrypt -q || die
+	einfo "running test ocb-aes"
+	./src/tests/ocb-aes -q || die
+}
+
 src_install() {
 	default