Rev-add dev-libs/skalibs dep (thanks Martin Väth, bug 412561)

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

4 files changed, 25 insertions, 9 deletions

diff --git a/net-misc/mosh/ChangeLog b/net-misc/mosh/ChangeLog
index 93f4423af607..27f2c70912ce 100644
--- a/net-misc/mosh/ChangeLog
+++ b/net-misc/mosh/ChangeLog
@@ -1,6 +1,10 @@
 # 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.7 2012/04/18 15:43:01 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v 1.8 2012/04/19 09:10:13 xmw Exp $
+
+  19 Apr 2012; Michael Weber <xmw@gentoo.org> mosh-1.1.94.ebuild,
+  mosh-9999.ebuild:
+  Rev-add dev-libs/skalibs dep (thanks Martin Väth, bug 412561)
 
   18 Apr 2012; Michael Weber <xmw@gentoo.org> mosh-1.1.94.ebuild,
   mosh-9999.ebuild:
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 60948dd84ca0..40b7b1b25265 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 DIST mosh-1.1.3.tar.gz 135180 RMD160 58c916e7c01ed202ee4f8d059ede382c4bb87801 SHA1 011a59ebaf1cd8230ca8320c15b95db0575889f9 SHA256 6d0fd2382662d2fa2604a7fa62a7d43fc1284035c65f1b67aa880ca95421a184
 DIST mosh-1.1.94.tar.gz 165370 RMD160 355c120c7234dafc1cd4b8f6d0ba385f0ea0fde7 SHA1 b6b36cfb55f6301533748343936c08755bc6e4ce SHA256 8c300cde1e0bb2121a3802407710647232d3d4f1a7ba0042e1afe58168687d9b
 EBUILD mosh-1.1.3.ebuild 1553 RMD160 dfbe624c64786b19e3d6ff5f2098e009a733684c SHA1 0d66c86dd07b042d4b329a5a3c529fa78f089687 SHA256 0c1c6781c8d289ef0df8976bae9c4e64eeff3627d2669cc67a62fadbb26b901e
-EBUILD mosh-1.1.94.ebuild 1272 RMD160 83f22deb43edc850ea963ab8b7df677d1e6c603a SHA1 9b3b584669f8d2ad8e95869179c06336535fc784 SHA256 3f98c7f9bfd9798fce191f390fa51e0169d19fcb59f6de1c58cef6e0a1df0f74
-EBUILD mosh-9999.ebuild 1225 RMD160 86196ca82e29bb0b1a4aea0825148612770dba5c SHA1 4aec0a00c05f77859573f8083b8d394c604a8f39 SHA256 d0726934fcc17d1167025db62453a676195886e98a2030ee43bb45cd45837b8e
-MISC ChangeLog 999 RMD160 021587f34c709315494500905b7f1e0fe12d1791 SHA1 8fbd53c12222a02b0682621b0c59ec81bd1230a6 SHA256 9fe9e49d9e91a7b6bbdc9813603007094f915326c6d4ee41d01a364171bdee12
+EBUILD mosh-1.1.94.ebuild 1427 RMD160 d940c5e51354e4d34f87aface268909bd75f5cb8 SHA1 1cf0349bba48d90bd9f0dc6e73637c2016357cff SHA256 be0be6c6c62c178a2ed0b46a04fa84cdf45bca19c112c0a522802fadcc8ca42d
+EBUILD mosh-9999.ebuild 1380 RMD160 f0d050bb8d5768b3351f397b660a53dd7a599ee9 SHA1 2a2d8affa136325d7186f3c0b268ddb4dec75d3b SHA256 617355586da6673f6924353284970fe09a9b5005ed1993ba1dc0543eb4dc0cef
+MISC ChangeLog 1151 RMD160 8ef7b49155e6a7e59b679062e03aa197e12cff51 SHA1 8523d7b3fbbb78a48d2e0aebffa7fb9098acf605 SHA256 b6509171e30d5f9e30cea950c4df721674cdf3b8db38d6826c392bb8d7761e73
 MISC metadata.xml 761 RMD160 f9474551c2d01a25d8cceabad1595bf450f1d225 SHA1 b287a1d5b79a05f1e230f7c71316abf6808ef816 SHA256 af9c5a3a61b5dd347ddf6101d68a5e934fc1895aad842d4ee0a103bc626ed8c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+O4QsACgkQknrdDGLu8JA63QD/VNe5J80p1XU+0ZpVNKnyMLrm
-5JZXgWem0PymqiRuKiABAJCojfyNoj2vGjgG8H13QiUSt9SvG2eh3tHfjhG+PyLh
-=rYoY
+iF4EAREIAAYFAk+P1nsACgkQknrdDGLu8JABQgD/WwhK8aZsPTEyDo4+9moXflWH
+mwR2TKWmX8PD2VZ7rxYBAIRVU9TwLQy1zRkigt22iQB5w04KlkeEl9U0GfSQHkIQ
+=vf0n
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mosh/mosh-1.1.94.ebuild b/net-misc/mosh/mosh-1.1.94.ebuild
index 550793479cc5..10805510b496 100644
--- a/net-misc/mosh/mosh-1.1.94.ebuild
+++ b/net-misc/mosh/mosh-1.1.94.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.1.94.ebuild,v 1.5 2012/04/18 15:43:01 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.1.94.ebuild,v 1.6 2012/04/19 09:10:13 xmw Exp $
 
 EAPI=4
 
@@ -18,6 +18,7 @@ REQUIRED_USE="|| ( client server )
 	examples? ( client )"
 
 RDEPEND="dev-libs/protobuf
+    dev-libs/skalibs
 	sys-libs/ncurses:5
 	virtual/ssh
 	client? ( dev-lang/perl
@@ -32,6 +33,11 @@ src_unpack() {
 }
 
 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
+
 	eautoreconf
 }
 
diff --git a/net-misc/mosh/mosh-9999.ebuild b/net-misc/mosh/mosh-9999.ebuild
index 71a44068e229..834458b9b9ed 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.3 2012/04/18 15:43:01 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-9999.ebuild,v 1.4 2012/04/19 09:10:13 xmw Exp $
 
 EAPI=4
 EGIT_REPO_URI="https://github.com/keithw/mosh.git"
@@ -18,6 +18,7 @@ REQUIRED_USE="|| ( client server )
 	examples? ( client )"
 
 RDEPEND="dev-libs/protobuf
+    dev-libs/skalibs
 	sys-libs/ncurses:5
 	virtual/ssh
 	client? ( dev-lang/perl
@@ -27,6 +28,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 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
+
 	eautoreconf
 }