diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-07-31 12:40:06 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-07-31 12:40:06 +0000 |
| commit | ae79c624dca31f054bf40eee39e670cba29f86f1 (patch) | |
| tree | 1b9a12bc1db2747327f4979a5d2e31d4e1b4da8e | |
| parent | Drop keywords for arches that don't have systemd or gnome-shell-3.8.4 keyword... (diff) | |
| download | gentoo-2-ae79c624dca31f054bf40eee39e670cba29f86f1.tar.gz gentoo-2-ae79c624dca31f054bf40eee39e670cba29f86f1.tar.bz2 gentoo-2-ae79c624dca31f054bf40eee39e670cba29f86f1.zip | |
Fix reordercap.pod (bug #479098).
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key A792A613)
| -rw-r--r-- | net-analyzer/wireshark/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/wireshark/files/wireshark-1.10.1-pod.patch | 11 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-1.10.1.ebuild | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index 7d6cbb4a320d..40c8c54acdbd 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.522 2013/07/30 22:26:03 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.523 2013/07/31 12:40:05 jer Exp $ + + 31 Jul 2013; Jeroen Roovers <jer@gentoo.org> + +files/wireshark-1.10.1-pod.patch, wireshark-1.10.1.ebuild: + Fix reordercap.pod (bug #479098). 30 Jul 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.10.1.ebuild: Stable for HPPA (bug #478694). diff --git a/net-analyzer/wireshark/files/wireshark-1.10.1-pod.patch b/net-analyzer/wireshark/files/wireshark-1.10.1-pod.patch new file mode 100644 index 000000000000..082f5d0fa5a1 --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-1.10.1-pod.patch @@ -0,0 +1,11 @@ +--- a/doc/reordercap.pod ++++ b/doc/reordercap.pod +@@ -40,6 +40,8 @@ + When the B<-n> option is used, B<reordercap> will not write out the output + file if it finds that the input file is already in order. + ++=back ++ + =head1 SEE ALSO + + pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1), diff --git a/net-analyzer/wireshark/wireshark-1.10.1.ebuild b/net-analyzer/wireshark/wireshark-1.10.1.ebuild index 1026abe061a3..fc7d1f88350c 100644 --- a/net-analyzer/wireshark/wireshark-1.10.1.ebuild +++ b/net-analyzer/wireshark/wireshark-1.10.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1.ebuild,v 1.2 2013/07/30 22:26:03 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1.ebuild,v 1.3 2013/07/31 12:40:05 jer Exp $ EAPI=5 inherit autotools eutils fcaps flag-o-matic user @@ -78,7 +78,8 @@ pkg_setup() { src_prepare() { epatch \ - "${FILESDIR}"/${PN}-1.6.13-ldflags.patch + "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \ + "${FILESDIR}"/${PN}-1.10.1-pod.patch eautoreconf } |