net-analyzer/ostinato: New patch wrt bug 363911.

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

5 files changed, 37 insertions, 45 deletions

diff --git a/net-analyzer/ostinato/ChangeLog b/net-analyzer/ostinato/ChangeLog
index 426459bf76e4..e2c0361a04c0 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.6 2011/04/18 17:53:33 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ostinato/ChangeLog,v 1.7 2011/04/19 13:58:13 c1pher Exp $
+
+  19 Apr 2011; Dane Smith <c1pher@gentoo.org> -ostinato-0.2.ebuild,
+  ostinato-0.3.ebuild, +files/protobuf-2.4.0.diff:
+  Add new patch for 0.3 wrt bug 363911. Now works protobuf-2.4.0a
 
   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 1b562ef516a0..46e2a0fdb84a 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1,26 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ostinato-src-0.2.tar.gz 209319 RMD160 7bdd4e3c40b513ae223cbdf2b862359d27192635 SHA1 9d9770becaf5ae293d72d1a0ff597c7d9916e1f7 SHA256 efad7ca13e23d208dd1526797826d57bcc964a7f0844d5bde9d1c2ce46f515d6
+AUX protobuf-2.4.0.diff 259 RMD160 9700aee1fda7d7a11fe5f1f3a6bd0da0ff1c1a13 SHA1 694340d20fd7bd8f25e013748b32dcac1c219e5d SHA256 e3b67ac0effec960d14c38bd2ad7447d2dd503e4075346da10c1cbccacdce2d2
 DIST ostinato-src-0.3.tar.gz 241488 RMD160 4cc3b856e99b0c7196fa3d1a8b36e006d8f19ab7 SHA1 c4bbeb787c1e21d43de1cc60d38175ce5957ae84 SHA256 d257270879533212d7fec9f5260b4d3163e0822f8ffdde0fa3f96779fd12e1bb
-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
+EBUILD ostinato-0.3.ebuild 701 RMD160 8bd166eb1ef56190ad398618365395846e9102d5 SHA1 c73219f86b537142e3060fe577b0c2a1843a62dd SHA256 29bee2a91c9de56b9481b21f1bca78eced31d5d8d6ab4e021c72284822dbc353
+MISC ChangeLog 1226 RMD160 3d565dd7ab1d3b327dd43f1f4c86a3eb204425fd SHA1 d9d9f3c407c7deea86b257ee2868c1518c8d98ec SHA256 ace76ebb5eb21af5dcace237afc5e0c06167e4079fc69b073c03788eea0c3eeb
 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
+iQIcBAEBAgAGBQJNrZQoAAoJEEsurZwMLhUxluEQAJycIDRx5nzyDs4WM9Fuj0Ol
+cOLRH49tRGpO434YZfwuYoZWF25b1lf5sQr/c2QI2G7kQpGwNpbBeIl/Rc9zBaaN
+/LrSqJ+ItCYTWYc0H1gHklNNfhe92Lg39T3iJb67JBg/BXNfvMov3UcYFZUxte38
+k0BePS7WSWMGNh6zFRzhs65bxES1BmYz9lWhtynIa62T0MqjXzJWkeZVs+wqwWZu
+x1LnBYTXnblHeFy+uBdAjVK5oRgsT7eu84VaSMzNigi5o/PqNm8xDVF0xNMHUdnB
+5XedgK2bQ1qntROoh4wVtgySUzxFDaP/huAs716Rkw3lsZTutmE8jhdKwSJBB5tN
+Kjz7s7j4GwKI6A5jtybF2/8ALpxTxAJ/kyhE22juuQMszx3qBOISTt/4HZ5X84GJ
+551GjkI/oLy1S66wU8XUYf8TTa0I8w7aAYTDE/RMJlKbzdu5feqDcG5C3eKsj1iR
+67hB83TSH0uFvd+vpfqHCNhfq70HzEtpGpY/805xDU53UXgg2RH4tP3ECmYvGvix
+frvO1FnrRUtz8dbt+BYBHcNlbJag/rTNqycxq9g58Hvi/fA+bu2nJIvFj6FcfzbH
+1YLgnBwHBEhS6ajSCZU5yLO3NiZF0zXsqxqmWCvAvdtO2eZeoWVXvUVe3Cf5JEK9
+pjj48K3wTRCCi5gZDS9f
+=kUZb
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ostinato/files/protobuf-2.4.0.diff b/net-analyzer/ostinato/files/protobuf-2.4.0.diff
new file mode 100644
index 000000000000..4d42b253a844
--- /dev/null
+++ b/net-analyzer/ostinato/files/protobuf-2.4.0.diff
@@ -0,0 +1,11 @@
+--- common/protocol.proto	2010-11-08 11:47:19.000000000 -0500
++++ common/protocol.proto.new	2011-04-18 13:54:03.725337006 -0400
+@@ -19,6 +19,8 @@
+ 
+ package OstProto;
+ 
++option cc_generic_services = true;
++
+ message StreamId {
+     required uint32 id = 1;
+ }
diff --git a/net-analyzer/ostinato/ostinato-0.2.ebuild b/net-analyzer/ostinato/ostinato-0.2.ebuild
deleted file mode 100644
index 069a69dbdc5e..000000000000
--- a/net-analyzer/ostinato/ostinato-0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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.3 2011/04/18 17:53:33 c1pher Exp $
-
-EAPI=2
-inherit qt4-r2
-
-DESCRIPTION="A packet generator and analyzer"
-HOMEPAGE="http://code.google.com/p/ostinato/"
-SRC_URI="http://ostinato.googlecode.com/files/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/protobuf
-	net-libs/libpcap
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-script:4"
-RDEPEND="${DEPEND}"
-
-src_configure(){
-	eqmake4 PREFIX=/usr ost.pro
-}
diff --git a/net-analyzer/ostinato/ostinato-0.3.ebuild b/net-analyzer/ostinato/ostinato-0.3.ebuild
index d7148be5ab70..8fe56059ecfb 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.5 2011/04/18 17:53:33 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ostinato/ostinato-0.3.ebuild,v 1.6 2011/04/19 13:58:13 c1pher Exp $
 
 EAPI=2
 inherit qt4-r2
@@ -21,6 +21,10 @@ DEPEND="dev-libs/protobuf
 	x11-libs/qt-script:4"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/protobuf-2.4.0.diff
+}
+
 src_configure(){
 	eqmake4 PREFIX=/usr ost.pro
 }