With USE=qt5, make sure we discover the correct RCC (bug #555638).

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

4 files changed, 66 insertions, 10 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index f82b2b7796e7..bbbdc4ee586e 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.739 2015/07/22 17:34:09 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.740 2015/07/24 05:44:36 jer Exp $
+
+  24 Jul 2015; Jeroen Roovers <jer@gentoo.org> wireshark-1.12.6.ebuild,
+  +files/wireshark-1.12.6-rcc.patch:
+  With USE=qt5, make sure we discover the correct RCC (bug #555638).
 
   22 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> -wireshark-1.12.4.ebuild:
   Drop old insecure version
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 5c9a56891409..8d5c00be4f2f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX wireshark-1.11.0-oldlibs.patch 776 SHA256 0b4b23ad3ce7022809187ce970733a4c6bdb9fed31099853b399498fde8dee66 SHA512 dde2cbfd839409c594562b71783204279c37697939d44ee56ce4966d7dd43d04ab5837bd51551c416ec789b56f8efd0016e6ecc2311af8b3109e987da301bef6 WHIRLPOOL 57fb7f67166440208c5fe023f8c7e62a4f860ae5fecf02df6e9b8b45fe31c999f7eeeee83914bbfc26c656c69bfceee75c94f9ac80c64ebd0c1d6db792b66665
 AUX wireshark-1.11.3-gtk-deprecated-warnings.patch 1068 SHA256 0211d3f345617554add63f3101a548a990e26219b31b28003e4dbf607d38de88 SHA512 9ea643e8f707d9f9fe3ce61b875ae1828c77cd81c636423fc5572420fd3b103042e078f89541c5145db49f133828d333c55d1c2c3b9a162f0756051ef9d946b9 WHIRLPOOL b04cad3b70bc37b9cbc833227bdf9c32c17e67ad067902d3fb35f467fb76520546ecd508de1805ef810b76ebe4f0b686e483817c790cb4ede75c229505596502
 AUX wireshark-1.12.5-cross-compile.patch 1569 SHA256 15a9f96e5041483f526cfb200549840ac369012a4fbc5ae35461d6095991eef0 SHA512 08a7a7ba8291fc0f948660929455b883de8efc639a4d9210d22ee7abb0e09551b42d7ba1ea87174283cc9a9f7384ec6f87b0c4caa46b55316baa093e50078e75 WHIRLPOOL 509e054471d17862e083401b306138c68c5c0785aef1b0927e4f16cc82dfc0ecec4d7dae29a63516bfc7fa7ab06419c817cf10c00ece30903052a1b02f1f341e
+AUX wireshark-1.12.6-rcc.patch 1267 SHA256 f57cfa987709721c9fd9855e9ee6d916ddad9d3f2ecb0ad431b003c223df00b8 SHA512 2ca26385e5ade8b4c6ee8513527cc86cfd1ba39aef8c31d24e359f7699a0502aefa842512e744c701e6d204550d1907db042b3d57613645f3946fd7f7365907c WHIRLPOOL 02130cd65a2210d6db438dec325ceef11992624ea3acb6e1ec1c40dd0ce3852f7c7cc9ada7c66c1672308bace7cb1053fb86e8c84121504b0e835e7ed83f58bd
 AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a53003e9fa47869f54c6f2f30d315720 SHA512 c4a2c66e6ea9b523ca9f5a3e37411221f5aa630de07d7bf84633855ac44da60b3b493671e578dbfd67de94e87ab1c79203f9b80b57f9460f2a81ee39f58171b3 WHIRLPOOL ca20e190c7a8d7ca69c6d90cfb28f8f1c8896b6793b9a026567ec4df4f7080ca6424ab249d01754db1059891d32362444178272489b4425e895f3031a0e1e0f7
 AUX wireshark-1.99.0-qt5.patch 2757 SHA256 79621949e1b0d99229e1a033b58f7a2c18cfb1afa0e4868d1ae91b7f372ced8f SHA512 e3e660db8711985e2522bd2e1fea7833781ce8b7d5e00489d50141ea9c3a1ee41105d5cdd48750fbee4437a5607ec7161c1f5a6cf40ea938ef16975183b28078 WHIRLPOOL e40f53957c9cb2f54cb2f1abb768c75e73cc7d5e26dd41613c9d0519306bdbd669d4712f5e4006a6369f80e97da6e47355936dc4d3320eb02b6902952e19d97d
 AUX wireshark-1.99.0.1975-sse4_2.patch 555 SHA256 bef93463a257b6154cf55f85e7860b373264e2a89f212f6db773ad02f3a6bedf SHA512 5086b36ecf9b1dd3292011602c8824a572dc759a0e35049a39f0da8045a93738a8f2c2b4c053a0f1d999dc8cdb7bfec3b33f2780d8795135dd65984355485578 WHIRLPOOL 55301e3ff688fbe7df405d40dd8a6e942d1613ee0e4543f46fa83ac6f0688170753fe1cfc67bbe00b9bd7a46cf73513530cc746ee29ba7845e3a45d12ed07743
@@ -13,17 +14,15 @@ AUX wireshark-1.99.7-qt-pie.patch 259 SHA256 679140d3a9d71ec3eed78d491f8066c3c36
 AUX wireshark-99999999-pkgconfig.patch 1563 SHA256 30aff5b0264210c823bf892f9c87de4d8ce28cca09ed2f6b22ebae4f58e7bb17 SHA512 4f22ac8c6e0cd4f37428d028810a56e722cdd78bdd24bab7f4686b0fc6179a2105e6436c12785f8430e4c10e76eeb6db17cf5d4dfe2b1cc40ed2041c777a0bda WHIRLPOOL 3f958c87f8957cc364343f2dc9cb4663d6218bb2752a74d4599441c2fdaed73947beda3185824e80128c49ba2a03de63422987a3df9aa6f69b1c5b07574e9cc4
 DIST wireshark-1.12.6.tar.bz2 29166493 SHA256 22ac0cc872f12cef9bb2cacfe0720eed8533dc5cea102d21de511620606cb3b6 SHA512 a8fb576e359d6534fc2df3372f23c1f338aed393749786cde21d8593f50ccec154d05c9298f7ddfcaa3a0dcee921975c6a40070a8d0b84f6fbb7f8df16b2b17b WHIRLPOOL d6c8cc268e46ab59da1d06d73dc5a7e7e16f9b07297f04a6e997fbf72a5a8ceb71847f892ab0fc281e843e3f23e8ed3bf85580b19e76e2103b0cb388c2bc9850
 DIST wireshark-1.99.7.tar.bz2 30137558 SHA256 3d34d51edabc07ceb13734f222421f2fb012a870c837ffb313dc1af51c16b28a SHA512 2887b6b1fcd0a7ecdc0e82b8e5d2660e5ed077d27c0ebbb965770ae3cb9df484ac8964b29f68911524381a4b134743688f2cc785fb085c2687fc629dd9d7f2a0 WHIRLPOOL 350627f09dc2e13b4893b4406d5daffba605e424c80b7deecd20405b02e8839f6a193fd1baf7585f56e4bfba01b8008e93bdf264c7b5a42d7a3b009022c3ee6b
-EBUILD wireshark-1.12.6.ebuild 6476 SHA256 39e03a79338e593fc52498ce4ef1788c2aaa19bde373fc529ae5052287c7f4a3 SHA512 9e514b753e54319dc583d66d377c175fe8a4092c72f0e4fe4202570ece5f689dec16cc471c9131652c10d57d089237c1000fefd01157beb48221c7cfa724c68d WHIRLPOOL 8f49e25f4ed694c74903f9997b441b21530af69d385d808349d80871f261af78578102328fdbe47630023c840dd10ff107cb09b6b3e2e0036a41785c7a2ee524
+EBUILD wireshark-1.12.6.ebuild 6513 SHA256 b1a7d7ca7774463214dff64296a10b4c4329934f07c0e745e7f45d9889d98dbf SHA512 54a18206cfd2acdc4462085bc49ba12471f9fb87a060ea31b92c37566db3c67f9fed9b961e821a51f887451816bbc224cc08fada192a583439a9b85958e7b3b5 WHIRLPOOL 8f8e71dafb891ed832180a736381d8c77355d6a4dcd2ed7351c299d3a254bec0b25fba2df0be4230027576201e2c21a8a3408d970738bda117438b25bc037f32
 EBUILD wireshark-1.99.7.ebuild 6534 SHA256 2a57f1c9f202000a35ba9a374932be7a67b39401a433e66c4ebc180d4b566f97 SHA512 1144f959985e431879cd4029a1f6e7cf994398fc5569655b773434bcbc62d654cf6ddd660cc7b09f079ad1cc4d056f8b6ea662b2064db2837ef58bc72dea8808 WHIRLPOOL fa76e68733976fe6ea09e29b86e9aebff9c9cf001842741557c6c19cc3bfc9444193c731d32104f43456b4c4064e680b5819863f5c19babe98ec4705bd0f9c57
 EBUILD wireshark-99999999.ebuild 6529 SHA256 1603db544ef16c4d7aeb053c61a512d2dad611d47ad5b2189ccfcae98986825a SHA512 e4f96c2bcdbbefd8a62041cb968d12479d622576c36f951e1ef35f4f71939c684b293055666de4cdfe2b6653006858360c0f7d598732cdf9e3c092e9ade01dae WHIRLPOOL 2cfdda65c2792e9bf34117af733c65c9248e517cd81db8c4a1ca2099cd61b7d70ad96c8f71414c6334353144fdbb765f4e9123d70ae7c9a4c5e03b9832bc94b3
-MISC ChangeLog 107029 SHA256 3e42fceef1e7464bfa6a416fc987d56c51efa3b2f6ae6aa14fd855eed774e42f SHA512 54aa7502d1c13f3aa23d68573f6cded26f4bab0e306dcdada845c64cc27e5bbf011cbb48d4346565e79b0074acd0afbf1ea6a18cc191ecb3b721883bf94e3b36 WHIRLPOOL 2d97c05d196f7acf7a587b69c37728be75b041fd70a18ccd8baebb0c72ada8bca952e7fa7cb5849edeb03f6e8f92aeb88d7fc576f51c464213930de5162cfeee
+MISC ChangeLog 107204 SHA256 cff9f6ebf1abc4b562e75290319dc80ce1c516f680c1a494b5345a4c1af13d1e SHA512 eb57310e2b649b04a6617ce0812cd801d14087f98b44545508a057e3329cf973b0b172ebd2e68d5f83d53793bd65e6cfc17c6fb8f575527594ac835eba6cac6e WHIRLPOOL 5939242a4fce9dc5cd369b69e7af6ce48c80bd75e7f06c6c16270facb66d13f7e25b469569025dc9c59adb19d55bdd9648168f2e8647596a5135393f7164010e
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlWv044ACgkQG9wOWsQutdadEwP+LT6ugKyl+8sT52WSpr8L74gH
-NXKB67j5Z4m6YPTNc14K86B0czsFUOiDLhmArd1zDpAgfVKcQpKLJZLdiiOdcB5H
-EeAu9gzPrpKqgruA7QaX3akaX3gnBnbmQ0BjE8IqpbcdSjmRqSZ4aTfWgT5DmeAB
-XbxUFOGK1cnGymTAxxo=
-=5pc/
+iEYEAREIAAYFAlWx0MUACgkQVWmRsqeSphMJTgCeNLQnLhSj6npk6nFaSRuUnfGM
+wtkAniqDy4+r3rVbGVbAeVxAHTpBNQfg
+=zf4y
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch b/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch
new file mode 100644
index 000000000000..b8290d00c969
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch
@@ -0,0 +1,52 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1609,11 +1609,37 @@
+			# we don't know whether they'll be doing that,
+			# so this is the best we can do.
+			#
+-			MIC=moc
++			MOC=moc
+		fi
+	fi
+ fi
+ AC_SUBST(MOC)
++AC_PATH_PROG(RCC, rcc)
++if test "x$RCC" = x
++then
++	AC_PATH_PROG(RCC, rcc-qt4)
++	if test "x$RCC" = x
++	then
++		if test "x$have_qt" = "xyes"; then
++			#
++			# If you want to build with Qt, you'd better
++			# have rcc.
++			#
++			AC_MSG_ERROR(I couldn't find moc or rcc-qt4; make sure it's installed and in your path)
++		else
++			#
++			# We shouldn't fail here, as the user's not
++			# building with Qt, and we shouldn't force them
++			# to have Qt installed if they're not doing so.
++			# "make dist" will fail if they do that, but
++			# we don't know whether they'll be doing that,
++			# so this is the best we can do.
++			#
++			RCC=rcc
++		fi
++	fi
++fi
++AC_SUBST(RCC)
+ 
+ # Error out if a glib header other than a "top level" header
+ #  (glib.h, glib-object.h, gio.h) or certain other headers( e.g.,gmodule.h)
+--- a/ui/qt/Makefile.am
++++ b/ui/qt/Makefile.am
+@@ -116,7 +116,7 @@
+ 
+ .qrc.rcc.cpp:
+ 	$(MKDIR_P) $(@D)
+-	$(AM_V_RCC)rcc -name `basename $< .qrc` -o $@ $<
++	$(AM_V_RCC)$(RCC) -name `basename $< .qrc` -o $@ $<
+ 
+ ui_%.h: %.ui
+ 	$(AM_V_UIC)$(UIC) $< -o $@
diff --git a/net-analyzer/wireshark/wireshark-1.12.6.ebuild b/net-analyzer/wireshark/wireshark-1.12.6.ebuild
index 0f0b96cd09a3..c4d1f2eaf705 100644
--- a/net-analyzer/wireshark/wireshark-1.12.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild,v 1.12 2015/07/22 15:32:49 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild,v 1.13 2015/07/24 05:44:36 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
@@ -97,7 +97,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.99.0-qt5.patch \
 		"${FILESDIR}"/${PN}-1.99.1-sbc.patch \
 		"${FILESDIR}"/${PN}-1.12.5-cross-compile.patch \
-		"${FILESDIR}"/${PN}-1.99.7-qt-pie.patch
+		"${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \
+		"${FILESDIR}"/${PN}-1.12.6-rcc.patch
 
 	epatch_user