From 0f056e0184756c1bf7109fdfc5818b926970dca3 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Wed, 1 May 2013 11:47:21 +0000
Subject: Fix dev-lang/lua-5.2 incompatible version dependencies (bug #407071
 by Graham Murray).

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key A792A613)
---
 net-analyzer/wireshark/ChangeLog                  | 8 +++++++-
 net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild | 4 ++--
 net-analyzer/wireshark/wireshark-1.6.14.ebuild    | 4 ++--
 net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild  | 4 ++--
 net-analyzer/wireshark/wireshark-1.8.6.ebuild     | 4 ++--
 5 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'net-analyzer')

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index f457a50c3b2e..0f9a0dd31a47 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # 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.475 2013/04/27 17:05:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.476 2013/05/01 11:47:21 jer Exp $
+
+  01 May 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.14.ebuild,
+  wireshark-1.6.14-r1.ebuild, wireshark-1.8.6.ebuild,
+  wireshark-1.8.6-r1.ebuild:
+  Fix dev-lang/lua-5.2 incompatible version dependencies (bug #407071 by Graham
+  Murray).
 
 *wireshark-1.10.0_rc1 (27 Apr 2013)
 
diff --git a/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild b/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild
index 0d5dae91dafa..dd09626e5e33 100644
--- a/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.14-r1.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.6.14-r1.ebuild,v 1.5 2013/04/24 14:50:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.14-r1.ebuild,v 1.6 2013/05/01 11:47:21 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -32,7 +32,7 @@ RDEPEND="
 	)
 	kerberos? ( virtual/krb5 )
 	libadns? ( net-libs/adns )
-	lua? ( >=dev-lang/lua-5.1 )
+	lua? ( <dev-lang/lua-5.2 )
 	pcap? ( net-libs/libpcap )
 	portaudio? ( media-libs/portaudio )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-analyzer/wireshark/wireshark-1.6.14.ebuild b/net-analyzer/wireshark/wireshark-1.6.14.ebuild
index cf74ea0893c0..aa2063deb995 100644
--- a/net-analyzer/wireshark/wireshark-1.6.14.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.14.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.6.14.ebuild,v 1.13 2013/04/24 14:50:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.14.ebuild,v 1.14 2013/05/01 11:47:21 jer Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -32,7 +32,7 @@ RDEPEND="
 	)
 	kerberos? ( virtual/krb5 )
 	libadns? ( net-libs/adns )
-	lua? ( >=dev-lang/lua-5.1 )
+	lua? ( <dev-lang/lua-5.2 )
 	pcap? ( net-libs/libpcap )
 	portaudio? ( media-libs/portaudio )
 	selinux? ( sec-policy/selinux-wireshark )
diff --git a/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild b/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild
index 9d94f421062c..6c51cb5871e0 100644
--- a/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.6-r1.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.8.6-r1.ebuild,v 1.6 2013/04/24 14:50:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.6-r1.ebuild,v 1.7 2013/05/01 11:47:21 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -32,7 +32,7 @@ RDEPEND="
 	)
 	kerberos? ( virtual/krb5 )
 	libadns? ( net-libs/adns )
-	lua? ( >=dev-lang/lua-5.1 )
+	lua? ( <dev-lang/lua-5.2 )
 	pcap? ( net-libs/libpcap )
 	portaudio? ( media-libs/portaudio )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-analyzer/wireshark/wireshark-1.8.6.ebuild b/net-analyzer/wireshark/wireshark-1.8.6.ebuild
index 31be4af0ee93..cb40fcae4c7e 100644
--- a/net-analyzer/wireshark/wireshark-1.8.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.6.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.8.6.ebuild,v 1.13 2013/04/24 14:50:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.6.ebuild,v 1.14 2013/05/01 11:47:21 jer Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -32,7 +32,7 @@ RDEPEND="
 	)
 	kerberos? ( virtual/krb5 )
 	libadns? ( net-libs/adns )
-	lua? ( >=dev-lang/lua-5.1 )
+	lua? ( <dev-lang/lua-5.2 )
 	pcap? ( net-libs/libpcap )
 	portaudio? ( media-libs/portaudio )
 	selinux? ( sec-policy/selinux-wireshark )
-- 
cgit v1.2.3-65-gdbad