Version bump, new USE flags.

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

6 files changed, 106 insertions, 19 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/Manifest b/net-misc/mosh/Manifest
index 9452acc32551..ca0a3166ed8b 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA256
 
 DIST mosh-1.2.0.95.tar.gz 176065 RMD160 6221fbae9e6ae644f3e3b03f3ad698ce3a50b2cc SHA1 4eea379b965b660c5edd6a36822000ff3944c02e SHA256 cd2a8680aa6ed68cbfbd328cca0f83f7dd07456788b36f32aecd6c736ce47f8c
-EBUILD mosh-1.2.0.95.ebuild 1161 RMD160 2404bf8f71fc3d580b4f7429d061058974771f50 SHA1 9366ca3c79b3d3545edbd2dcf65393bd13784eec SHA256 9bf6c6ff5023212d57c7eafcd5a862b36c6b9f6d43c2f1f3b5b813352118f750
-EBUILD mosh-9999.ebuild 1102 RMD160 71e5e4dcc0721f8c8e44bc0e05fbc6f1872c1b72 SHA1 7faf450ed819f7e6c82b380b14b59b051e3cd913 SHA256 a9ef5a8dc17a9e006adbed0d5053ce61812188dbc619565430d584d7598262cc
-MISC ChangeLog 2994 RMD160 0916d31d71d529f60c442757d617e2baf888441b SHA1 36a9587fa3c5ce3eb33a90fb1833e50757e482ca SHA256 c02fcf6c5fd568c6c46863132828b4c2989973baea7b5dad6a35663eb8f180bd
-MISC metadata.xml 828 RMD160 0d3a0485a0c43838728773be310b3e687160a4ff SHA1 041fb3ffc659281e3222682bfbe586a7b58703d3 SHA256 f6495b998d11c739786279d02cae909a8479e02418772e88ba110bff1f42cbc0
+DIST mosh-1.2.0.97.tar.gz 282447 RMD160 db9f2cb88d16866f6c758e65c8dda51a2f5448b0 SHA1 98fd53c08cbb8f943666b072fcab2f9ac594fb78 SHA256 75c4651c5d667cbff55144273f2c582762942f474c0e722ee635eaed1b3a3022
+EBUILD mosh-1.2.0.95.ebuild 1135 RMD160 aeedb1112d8025c93c623f831b8c224db9824648 SHA1 97b625c73704db137c3452b3d19d638c3095a59d SHA256 033228b8ef26005d4337cceb8cac21768c986853006b66ab38fdbc79fdc24cdc
+EBUILD mosh-1.2.0.97.ebuild 1424 RMD160 3855db76d9fa513f7a1f9fe7a87fe2c47312ca40 SHA1 f73ed2dc57e91ec81ef4d8f97b3b69ae3476dc73 SHA256 2ea1888fa78835c575d8d8d448e341246893c9e3e2f643bf05a880b88a786334
+EBUILD mosh-9999.ebuild 1402 RMD160 81f9e23ded524f0093497a04dca95237547ea2f9 SHA1 ee02b24335647a217db0cedf3ba93800fc2a4f13 SHA256 62312abcc55e70e7f6be2d520fe53c42ec957e0b7b6b567a1717b4558916cef0
+MISC ChangeLog 3167 RMD160 25eafee4ae4e99bb3ea8e721587a5aaa3a661d68 SHA1 49c410fc4cb4a5beb7d3647810855ce2afc025ed SHA256 36bde5ef60bf3ab2b560b9e6dfc8dc4284c2b3db183f3a53e962fd78ec91c9d9
+MISC metadata.xml 907 RMD160 73f0637e836e8c64db18a9f8fb4dcad772592e11 SHA1 9d899ba9d5b05515298b64e50ebb8730816ff918 SHA256 6002c5af80ba011ae5157adf942c3b73658e1511545406ff6a84feaad51b5b31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+8ofEACgkQknrdDGLu8JCzJgD+PU/vdRYS6tdDym7yIRsi5aOS
-jSG6nl/7OOrkZ0GJChkA/j36OF+Zk8FjZFXK8kH+KrrsBLuUFCx04X0euj8Da7RD
-=z2Ra
+iF4EAREIAAYFAk+9ZEgACgkQknrdDGLu8JDJZgD+OOOOJWfDXpN56q2vD/2auamw
+6NrZR37YtYW4AlrZT+sA/1XRmqcb+QbUPN+UAJ/AUmBU/nfTbsf88u1ikTuklmfj
+=e5mN
 -----END PGP SIGNATURE-----
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