Add live ebuild.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 38 insertions, 28 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 7f9ad18e7d36..cdde26a2218e 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.662 2014/10/27 22:34:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.663 2014/10/30 23:53:12 jer Exp $
+
+*wireshark-99999999 (30 Oct 2014)
+
+  30 Oct 2014; Jeroen Roovers <jer@gentoo.org> -wireshark-1.99.0.ebuild,
+  +wireshark-99999999.ebuild:
+  Add live ebuild.
 
   27 Oct 2014; Mike Frysinger <vapier@gentoo.org> wireshark-1.12.1.ebuild,
   wireshark-1.99.0-r1.ebuild, wireshark-1.99.0.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 61cd5e1f469e..d9809e790151 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -11,23 +11,13 @@ DIST wireshark-1.12.1.tar.bz2 29059989 SHA256 82b26bd416ec15903b27785e35a6226870
 DIST wireshark-1.99.0.tar.bz2 29782811 SHA256 9454180264c288c0ae03dfc3856310e319acf29f7b2e8a8ea2fd91665b606364 SHA512 021d4adfe8a6a326def81daa79ede1fea8a214f6d9f9c3f1cb008a36e82fe42655cc6c6f4de2a425181e03e61f3dba5cad2ebb11605d29f4bbc0623f66f0d3db WHIRLPOOL 04e22741d28b4576bfceb1c0507fd8cce7b7781999245e1cc8cd1ae2063f62fa518c007f42826a445acf99f18c61b7b9f3deb67629438e7e3c9276d2282a5793
 EBUILD wireshark-1.12.1.ebuild 5574 SHA256 e83bbbcf29e7797abf3e15003984e1e70efcefa696417de68cbe62cf5c6c5625 SHA512 c4db05056c9e5c94d8df00419020ba22f5f4315b96040d067dccefe723e0805c24d088e4ca623a9b8d763ea4eebb284fad2cef6b390def1e84fd55b50d01debb WHIRLPOOL 0071b99ac8d7afaaf81246333957ec628b0089ee9ec1ac3915d2258f9f5f56cf0c0d316e979acd866dacc85ed858e7a31064ac38ad8e252d2b9191d3f6e34052
 EBUILD wireshark-1.99.0-r1.ebuild 6003 SHA256 b3ce80b98152f20d60ebfe385f740204f2bf67d503661e8f338dd7102a82d322 SHA512 bed04248280422e9f248652097906655d6f14eb9019b0bf42a88d349eb93a5f722b55ba092c26c041af5fa0bb40c77315bdc07f78ba08fb70fce43448e68bdca WHIRLPOOL 855f22708e09e48884d82c061a697c49bee2a3a4bbdecf74b0ccc89f43a33ec08b618ec588d6f42ec68c7d160a53b1742c5e6f726013e8fa120c862ba9734960
-EBUILD wireshark-1.99.0.ebuild 5752 SHA256 bceb2cf879e6d8bf211e30a496c26f66177e60f051618d083e04286ae3791fa3 SHA512 3579fbfa7ec574a6ddad6a25d2c778d7e83e797a60c07a273d2f1d8589ac004660e80bfaec2f5c8fdd36d61916682c21aff34b7687d39ee0a8518db467312be6 WHIRLPOOL 0f6a84a18f6a6c66d97480b17820e65f1c32a0932d79f68a1f3f6223434cfc4ac5856fc93c26d31164c17a007c69fd0ce8cd424d55bffd8935d8d18616364598
-MISC ChangeLog 96847 SHA256 2f7f9377ab3d920cb6fa59f0a2b34d6a6262fbc4bb0fbcc3232045fe6defc19d SHA512 5caa739b8d80aa8e8ab9e04ca3b131d52daa2ce66bcbee36ec133a1b84d691781e12ce6dc5f810898c7244c82aa3d39776f13dda22336d17c35f08fb227d18de WHIRLPOOL 5b8201a9bab6fa43a7cee6871a78f3105238d146c81aafc69dc1f8c7a682f203652f5c627c5d2b82cc9ae72ba7116d753fb8f3aba35f6dd9ecf213da045161ba
+EBUILD wireshark-99999999.ebuild 6043 SHA256 ef1b2a09f1c5a926994c9cddbe58470c821ea2624d9d52f19344e4a65bdfcc9a SHA512 e1b8a250bc4191b840284dcf88d271d15f154821b4d81b9aa9f7abcb829e34e8abd02ac4573cbb87fddcbc32fb27bc11b6d893443675d024e9dda92ff1ac6a30 WHIRLPOOL 724936358573c537520e5d8cc37c9160530e3d21c8eab98d9b25ba83cdde6ac811c07930f6cef5604b5f3a5a51307487884ed3c4266e256175ea23ed787796a5
+MISC ChangeLog 97002 SHA256 7fbe448f0d9ff9d4bd161eda145d7b2a5933ff47fdfbffa15f0e3b5298d76cfe SHA512 25debe07a6a44ced09ac7786867f268bb8412ad069618ca9edc59ba1744e492462125410d4de721e9a9972ccd8bff119500e5be12575c2e5814115deec4fb774 WHIRLPOOL 95e3190e9e2fe94edc5290124204eb14acde7d217dedba5e83265ddf3650f1725e3dc3e37c172623e143c248d0fdd1b041fa2dc80b29b16e55a0f8899c273b3c
 MISC metadata.xml 2460 SHA256 c764e8b164a3c24ee43cbbd46f3ce01b4015da62e9d29b1117868a3644497dc5 SHA512 f957bb3ce85ede2c8944581e116160fb601c1dddcc7cfdfa9b6a39fe5c9c7e51afe686369681a31ebc231a46aac33be5223730b1143f1895deb7569a606f2fd2 WHIRLPOOL 57259e5c67ec9d2dfd7ae69f17146a514915e4f3d0031eaebbdd9640f4b11ad9df25de71f223cf4df044bfa749a148ee5069faf790060761d800476e56619f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUTsiVAAoJEPGu1DbS6WIA7PIP/2hjzQQtPUVrrr6gdiMLZY+X
-6cIDOayQssFkcMwLShi2HE+eNaNkANIETSNzPUZU0qNM3Z1gny3U0++mWyPMbMOh
-9i443tgUYy1HJU974aPWkrb0UerhaEDaYIPFb50ALk/XMW6AeS/hmgTRF5TkUqxw
-4Gu5tNt7bKDKyxjmGYW6KeJcrCzkiUDP4E1vaMQZx+ahFw35/tBvdDlQAirT5IPk
-Gg4hfiTEWuKGLAI7mEMCCgu7MV2aY0tu9JEVITl+vpFX5064N3+P9q5lCQn9ifo2
-JcT754BNY6RoY7A8N9QNnlcTBFjidx1iGy4xAGF2kW4ibDIOeSWi/i0zG06P0R+h
-AMMsspRZOUH+Htvhkfxa3EYFMK5Sxv2va87pHqwFjCDKcqKgMS8MbtDa++HfKE+1
-R15JgFyMrNPkGdySKC7S47/EJRfHG8gPRJ+qik1z40C355oAm5oWSz18W32UcNwj
-uvunvMb7Pab4XhAucLfX4IdpI/7jNlkVRLoYy/d1kybJ6yuTI0waXJ4EuveaHFr/
-M8h6GnTRYQgBvH5+gs/IF63edteq49iGSO4WZWec0eWqfr2xCvUnvA6MxjaKwP3M
-ccbh0to5jOdOTyk4V8vyq0dXoo6dTJQqaGTNQceG1jJStztqP7Kk8PY29NEY9Drs
-7lN+tF5xElZhGfJ16doX
-=jE2X
+iEYEAREIAAYFAlRSz2kACgkQVWmRsqeSphNr1wCaAyATc3R4fMvnX017JSuX3am3
+DEsAn2zzeH06TA5GgRzOsYODrttud7Vo
+=SK+Y
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.99.0.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index d7a5860a7434..6f99ecd140c0 100644
--- a/net-analyzer/wireshark/wireshark-1.99.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.0.ebuild,v 1.3 2014/10/27 22:34:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.1 2014/10/30 23:53:12 jer Exp $
 
 EAPI=5
-inherit autotools eutils fcaps qt4-r2 user
+inherit autotools eutils fcaps git-r3 multilib qt4-r2 user
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
+EGIT_REPO_URI="https://code.wireshark.org/review/wireshark"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
 	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
-	portaudio +qt4 selinux smi sse4_2 ssl zlib
+	portaudio +qt4 qt5 selinux smi sse4_2 ssl zlib
 "
 REQUIRED_USE="
 	ssl? ( crypt )
+	?? ( qt4 qt5 )
 "
 
 GTK_COMMON_DEPEND="
@@ -46,12 +47,18 @@ RDEPEND="
 		dev-qt/qtgui:4
 		x11-misc/xdg-utils
 		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
 	selinux? ( sec-policy/selinux-wireshark )
 	smi? ( net-libs/libsmi )
 	ssl? ( net-libs/gnutls )
 	zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
 "
-
 # We need perl for `pod2html`.  The rest of the perl stuff is to block older
 # and broken installs. #455122
 DEPEND="
@@ -76,17 +83,18 @@ pkg_setup() {
 	enewgroup wireshark
 }
 
+src_unpack() {
+	git-r3_src_unpack
+}
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
 		"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
 		"${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \
 		"${FILESDIR}"/${PN}-1.99.0.1975-gcc_option.patch \
-		"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch
-
-	# Qt5 support is broken since the build system does not determine
-	# properly which `moc' it ought to use
-	sed -i -e 's| Qt5||g' acinclude.m4 || die
+		"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
+		"${FILESDIR}"/${PN}-1.99.0-qt5.patch
 
 	epatch_user
 
@@ -110,12 +118,15 @@ src_configure() {
 	fi
 
 	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk3 || use qt4 ; then
+	if use gtk3 || use qt4 || use qt5; then
 		myconf+=( "--enable-wireshark" )
 	else
 		myconf+=( "--disable-wireshark" )
 	fi
 
+	use qt4 && export QT_MIN_VERSION=4.6.0
+	use qt5 && export QT_MIN_VERSION=5.3.0
+
 	# Hack around inability to disable doxygen/fop doc generation
 	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
 	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
@@ -134,7 +145,10 @@ src_configure() {
 		$(use_with pcap dumpcap-group wireshark) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
-		$(use_with qt4 qt) \
+		$(use_with qt4) \
+		$(use_with qt5) \
+		$(usex qt5 MOC=/usr/$(get_libdir)/qt5/bin/moc '') \
+		$(usex qt5 UIC=/usr/$(get_libdir)/qt5/bin/uic '') \
 		$(use_with smi libsmi) \
 		$(use_with ssl gnutls) \
 		$(use_with zlib) \