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

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

4 files changed, 25 insertions, 34 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/Manifest b/net-analyzer/ostinato/Manifest
index 8554342709ef..4cac938971e3 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1,27 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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
-DIST ostinato-src-0.4.tar.gz 266602 RMD160 eebfd0ce4050973ff7b05b567c6c1b68ee7bee64 SHA1 15c98d02df7ee8dbf07d62639b9ac15d10291af8 SHA256 21df65769147d634e6fc11daba986bfc0b56651974c8bfc05e8284888e8067dd
+DIST ostinato-src-0.4.1.tar.gz 266662 RMD160 8ab847e0f77e2c6666bab4ca65e8116ca6eccee9 SHA1 ff802890283ed99c571a5bc68341e3d7e091e997 SHA256 46993d4f1f1351b27b1ee96354170c7fc3bb33853592ffcae6bd0b51f69fbb98
 EBUILD ostinato-0.3.ebuild 701 RMD160 8bd166eb1ef56190ad398618365395846e9102d5 SHA1 c73219f86b537142e3060fe577b0c2a1843a62dd SHA256 29bee2a91c9de56b9481b21f1bca78eced31d5d8d6ab4e021c72284822dbc353
-EBUILD ostinato-0.4.ebuild 703 RMD160 d296ebb7b477dbbb1437430139c4363c9d6209e5 SHA1 58fdecab14ab58887cd756ee36546e5f6e885170 SHA256 26ac550631ee17eeb9f32dfc10f0fdb8a7189dcdb0f03247b0a44f66cadc2992
-MISC ChangeLog 1354 RMD160 f65c131772cfd57942045b7b85ba8357a592a9d6 SHA1 3d3e68aa4abb12661a3019b6cb9e5e997b5f1ca4 SHA256 bc046b5dc4409a48ed3046a57934bf65f49080ca8bcf81f03493082b13b8d5e1
+EBUILD ostinato-0.4.1.ebuild 644 RMD160 5c6c1f6ff59cbf40731bf919c31a227ed0e322af SHA1 07253f0bf355a470aeead353b693acb4bbd2e286 SHA256 3aeb7bbfd5d40786be42010623dde06fba11c68d8f7246d8b028306f5ddac2b9
+MISC ChangeLog 1598 RMD160 ea734fb05a0f75255c2634c596bf05ed64cbd2b8 SHA1 f18daf527246fdbecfb09f5f8177afbd69e0f8fb SHA256 5eab974711187ce6737d703c864e57909f3e35f9bc8752f5d56f9dd6c0ce4453
 MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNrbKVAAoJEEsurZwMLhUx/HQQAJvFXexjY5fmH3/QyKO4WWUq
-+Pojlf/MGMqpH2nwnk0iphyaHiL3+OqkoIE70ifv+OzhHxwu0AR81GRZreYzOQP+
-bfTXBLI9hqs5Tvf+WY5MM41+qGwxWmBFetnIoM7YlgjNuTlHzy9t/f0FpQ2f0cq6
-cbOKLx93m4zF1ewlUvPesepKdXJ2XeV2wEz3i5ZigCjwOqzO01aGbSkoOSXEdn3p
-AxTTD2OGcsX/UHThy56zo57o/kUsPndR4fQmTFMOPPVZjQW36+Lhd613Eh7G52Dg
-lH4SiZcxqtMqu+4dpdktd+cJJdhC5ieQmufbLwS9wB9UHjVz7GqZapkPHzsXWdSs
-ShjGVVahVHabD2YuAytoZCYrWTOj/lwu5VJuILLsoqNTAijlwZhrFHIgntpYB3N+
-5grdzZtU4nTdGl1C3vWH5u23w+QsxQ/DStI/LnJEH68NHZtAvTCFwh442RZAGofQ
-yIlkFEQDQ8usNbi8FTCRi3Glb/2Uf4C+UoU7xo/i+tS9UAy49ZLu0ccNpRnOz2RW
-j3LV2eqy+oYCP71LZMGCBK7d0EElBir4a2aBGW19p2W93qr7rMKC3v1s3OdgZBaq
-K4ygrxW3gfVyHAooWuM6beb9I1KPuynAhWPn3x3XuGST2jMFRgoyrmztyWD/k33x
-fN1HnztZDOVnGK95KWdQ
-=s6Px
+iQIcBAEBAgAGBQJNyXD8AAoJEEsurZwMLhUxgqkP/0q/L4toW4CVz2JUEyiU70Yc
+ua1vbln6ExLZAPKIXw4zB2LwXMy8iCg/xhJCXhaKUfue0u1g422HXMcIT+6jqGEZ
+iLlHrwnen9OKxN+J49tX4Pigoo9AoIIryuXO3Qv3BAeG4Eb4T67gQNDuLvDRv6s+
+q9TowD4MYc984VRADknhIkmbp30yW1PvuIfTQsjttDw3OoRrZqhQg9/4cBKuB4bn
+rMF4FNyTfjiD8Ek4hQO3CVNdLnHYoeaRx04HtR8FXuYgcnCcc6ERAxAtdKrg+Vle
+8jF5L+4q9Vur4fgHS6PR+6ftSjq1U986TxKLrnGCaUTwERCMQwxA414yRsEEIpTx
+UOmsuEP0lmNT2O6wjUhN8wx6GKr00RjolFqNdGl8PFW81hUGQ/O7hD2FqSCbjXMm
+dX3f8LTjesW9S+DuqrzxqFNfVv6VUrdP84maErnYCLuTLlDhPo98YoKQHvUUDuuE
+2Jacn+nQ3VhdZxzvV/MEd+0bwCOpxtkKn1Q6fEincAohEfnGKAUphMG2wFS6zvpa
+1zz58eLgDTUbpt4EviwYjWkNfTGESF1cTozTrm9mhE6hockUM06DnOMPd7PuVxtC
+e9jnEugLnJRNAbIZk1JKRl5H/AZxOKRzrR2XVlwKwSD1YV4GteoSJfftLnlaQLFg
+gmp4UjOOedfuC6Gv4vsI
+=DGSg
 -----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
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
 }