net-analyzer/ostinato: Version bump. Remove old experimental and patch.

(Portage version: 2.2.0_alpha32/cvs/Linux x86_64)

3 files changed, 9 insertions, 17 deletions

diff --git a/net-analyzer/ostinato/ChangeLog b/net-analyzer/ostinato/ChangeLog
index 78da971912b5..864e425f95b2 100644
--- a/net-analyzer/ostinato/ChangeLog
+++ b/net-analyzer/ostinato/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2011/04/19 16:08:03 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ostinato/ChangeLog,v 1.9 2011/05/10 17:12:17 c1pher Exp $
+
+*ostinato-0.4.1 (10 May 2011)
+
+  10 May 2011; Dane Smith <c1pher@gentoo.org> -ostinato-0.4.ebuild,
+  +ostinato-0.4.1.ebuild, -files/protobuf-2.4.0.diff:
+  Version bump. Gentoo patches merged into upstream. Remove old experimental
+  and patch.
 
 *ostinato-0.4 (19 Apr 2011)
 
diff --git a/net-analyzer/ostinato/files/protobuf-2.4.0.diff b/net-analyzer/ostinato/files/protobuf-2.4.0.diff
deleted file mode 100644
index 4d42b253a844..000000000000
--- a/net-analyzer/ostinato/files/protobuf-2.4.0.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.4.ebuild b/net-analyzer/ostinato/ostinato-0.4.1.ebuild
index a8848452e96e..d17e90c6ef24 100644
--- a/net-analyzer/ostinato/ostinato-0.4.ebuild
+++ b/net-analyzer/ostinato/ostinato-0.4.1.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.4.ebuild,v 1.1 2011/04/19 16:08:03 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ostinato/ostinato-0.4.1.ebuild,v 1.1 2011/05/10 17:12:17 c1pher Exp $
 
 EAPI=2
 inherit qt4-r2
@@ -21,10 +21,6 @@ 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
 }