Revert downgrade force wrt bug 363911.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 32 insertions, 8 deletions

diff --git a/net-analyzer/ostinato/ChangeLog b/net-analyzer/ostinato/ChangeLog
index fcb324303df8..426459bf76e4 100644
--- a/net-analyzer/ostinato/ChangeLog
+++ b/net-analyzer/ostinato/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ostinato
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ostinato/ChangeLog,v 1.5 2011/04/18 14:34:55 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ostinato/ChangeLog,v 1.6 2011/04/18 17:53:33 c1pher Exp $
+
+  18 Apr 2011; Dane Smith <c1pher@gentoo.org> ostinato-0.2.ebuild,
+  ostinato-0.3.ebuild:
+  Remove my unintentional downgrade force wrt bug 363911.
 
   18 Apr 2011; Dane Smith <c1pher@gentoo.org> ostinato-0.2.ebuild,
   ostinato-0.3.ebuild:
diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest
index 76074476256d..1b562ef516a0 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1,6 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ostinato-src-0.2.tar.gz 209319 RMD160 7bdd4e3c40b513ae223cbdf2b862359d27192635 SHA1 9d9770becaf5ae293d72d1a0ff597c7d9916e1f7 SHA256 efad7ca13e23d208dd1526797826d57bcc964a7f0844d5bde9d1c2ce46f515d6
 DIST ostinato-src-0.3.tar.gz 241488 RMD160 4cc3b856e99b0c7196fa3d1a8b36e006d8f19ab7 SHA1 c4bbeb787c1e21d43de1cc60d38175ce5957ae84 SHA256 d257270879533212d7fec9f5260b4d3163e0822f8ffdde0fa3f96779fd12e1bb
-EBUILD ostinato-0.2.ebuild 649 RMD160 c9e9e056a4a85b656cbbf7c53754028b4def51dc SHA1 c5ff9226a7cd8ca5f1cd71396ea87bf9ee682a13 SHA256 118ca065496d5013fd772474f1951ba27e771cd53b1b7c18e6e6afc13ab99ecd
-EBUILD ostinato-0.3.ebuild 647 RMD160 faaf4585e95259eef31aa3162f09bf57bbb3b800 SHA1 2d3c0dee3e0cb479ee254fb20766419a7d861c22 SHA256 ef10b8ca2dfefdfa576e6c7385b8899994d0badcbc258790e2fa9cf338029bc1
-MISC ChangeLog 891 RMD160 4626f706d28d151a31f8086fdcf14b9a69a45d30 SHA1 3715c77140426afd32c760d706e25fd6bbe3725b SHA256 83687094d6dcd301928c7cee9ab700c88a866ce763c2e8fd59c846ec4029eb96
+EBUILD ostinato-0.2.ebuild 642 RMD160 e829784a4cbd614095679576ffc4b2a8ae994efb SHA1 f5d0b0bd09c60c5c47ff85e7db04d08f0d57d6bb SHA256 f516686238c0cef546690d8892862cd6886784ba3676f3052c5b69d29ed9e3f3
+EBUILD ostinato-0.3.ebuild 640 RMD160 9d6bfd82f500a73a9b4d3e42499e95697428831a SHA1 75034a47a764326e0d6eed0c5afce9bf55581fab SHA256 b15e499dcb704b9188f7faffb465554c0f8dc73bf5eb069ee374583dda4ce37a
+MISC ChangeLog 1040 RMD160 c2dc194be76b6ee17ea596ddf1c7f2ed116f9bf7 SHA1 18647c1b8304b41475a020386be7e67bc5df1f32 SHA256 61e0f73ccb398bcc6fb405d3652e13384f00a8c2b78786db32468979624f3c30
 MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNrHnQAAoJEEsurZwMLhUx3TAP/j2oCL8ic95lsoUgiLvjruJ6
+FRGwgPeBsY9hCB4WpqMRsYlDRp97fk4ufXL+oNGmFkqjapiIL3xGKAgVc4pdbNdC
+a6atB+J+XiElNaIvYiG7l2TMjvQB326QAD6jG/Vaxp5aP9ydR+9GopBXe1szc8rh
+niDj+4/8+qwRnUzmuIfLaUlrMlmevr5E8qwCgrqdoljOwUFnYXQwwHVpMtiK7ww4
+V78GlA0VypksX/MrRJ8eQsUf98oMgsCpWlanxwEV6glAd0ljePWKBANQ2qSieVKx
+ZKG6YZ42rsYGWyfu5brnjVFwLg4Ke81n/DWZsHEEh+tEwpMDCIirF5xsEmxa1h4a
+CWhykidz0uVJQGE2hRnDVhfqfZGEdZRUk0gcmEe9Djrgf+8JdY2gspQ15TyFKH//
+xGp0U3rZJcJ0+rMcClEF3oePYhR7YmAg/VzCl8m3VIvmTpgIOhYMAanGyESyfw9g
+vYli1b/hzaF6B7ibN8CHvtDNPqsZRVP8bUDeYwbDuPvHgVXI3OnAMtoH+RGx05dX
+ItxsxJ4J+1suOqxJ1kNlpTXpyA50XQ7XrmbiSDhqjsfbsNZjyOgHnkvaJCo5Eyah
+JZPquQ6LMa2gKvtH1TRZcJgxVhi/qmQU1H2wBuCLUy2A7aQ0HkyNZKHNzR+hTgJS
+v7RlEn9qy91N4vyxNUbs
+=QVr6
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ostinato/ostinato-0.2.ebuild b/net-analyzer/ostinato/ostinato-0.2.ebuild
index 3439dce351b2..069a69dbdc5e 100644
--- a/net-analyzer/ostinato/ostinato-0.2.ebuild
+++ b/net-analyzer/ostinato/ostinato-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ostinato/ostinato-0.2.ebuild,v 1.2 2011/04/18 14:34:55 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ostinato/ostinato-0.2.ebuild,v 1.3 2011/04/18 17:53:33 c1pher Exp $
 
 EAPI=2
 inherit qt4-r2
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="<dev-libs/protobuf-2.4.0
+DEPEND="dev-libs/protobuf
 	net-libs/libpcap
 	x11-libs/qt-core:4
 	x11-libs/qt-gui:4
diff --git a/net-analyzer/ostinato/ostinato-0.3.ebuild b/net-analyzer/ostinato/ostinato-0.3.ebuild
index d43682951e83..d7148be5ab70 100644
--- a/net-analyzer/ostinato/ostinato-0.3.ebuild
+++ b/net-analyzer/ostinato/ostinato-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ostinato/ostinato-0.3.ebuild,v 1.4 2011/04/18 14:34:55 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ostinato/ostinato-0.3.ebuild,v 1.5 2011/04/18 17:53:33 c1pher Exp $
 
 EAPI=2
 inherit qt4-r2
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="<dev-libs/protobuf-2.4.0
+DEPEND="dev-libs/protobuf
 	net-libs/libpcap
 	x11-libs/qt-core:4
 	x11-libs/qt-gui:4