gentoo resync : 06.05.2018

8 files changed, 51 insertions, 5 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8798705fb126..c186cc5d7bec 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 356919f8a6e2..66e5efd15634 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -2,6 +2,6 @@ AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad2
 DIST monitoring-plugins-2.1.2.tar.gz 2613060 BLAKE2B ea352b283166a183b993c474d7318b218e8ba75d2cca91ae1901046e6c4bc2075c21217038a649aaf1355f04d6133a623ee1439fa0d1548c8ec6d03fb8952854 SHA512 845eb7636691aa5402119384c3d4256969e959fbc29ef5257c24fc4c21536cad3dade30747f36c9ad998cb37df0f325df66ea679d3d5b96c2993b59a9a325fed
 DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
 EBUILD monitoring-plugins-2.1.2.ebuild 2858 BLAKE2B 3b07074b43e7dce8b468946f5184938a51444c093c3fb68a6abdfe7b3ea825f141c2b1994a54bed25b5362454a9d48e5684b12ed220ae14623c712dbd737fe81 SHA512 9426fdb164c60771cc3dddc6cff2e526ae7770400378b74dde706a2cfce7dba51aecddfb7c7a532e6bc07078d05cf28d64ddddc3e4eefeb4ec2bb70f44151f7a
-EBUILD monitoring-plugins-2.2-r2.ebuild 3014 BLAKE2B 78d8a4893f2c6b85cef516f8f20273aff29357b23aaf5b42c256903e6a8091d29632317f001a5c1ec41d63fec13b6a0482341b495888685aaaf9c0661839e6b1 SHA512 116db40f08b66e142691fd1dafda2c53e5ff8d069617d6778f98ac0aa25b514f6a4a10da8a51a1241921ac7ca43a0c5c6e6df191771cf0a8250874228cd066da
+EBUILD monitoring-plugins-2.2-r2.ebuild 3012 BLAKE2B 1f0eb5fcc41390935086afeeb0e88ea2a46b27ddaff668ab1be3edbd98218ee4cdd846d4f49ba4850ef48416d8228bd94bbdb687827e53865bad6d78c429257d SHA512 3092a8d9bae0ef4f0089be694ba1ee1f3486ff3708b7010da6cb230e72f5803dedbe5e7434d612052b2feece33789161dd05b03f70d9b3bdd1d67953415c4db3
 EBUILD monitoring-plugins-2.2.ebuild 2875 BLAKE2B 8dfdf9c0bdb239768f0d441ba4f2a6648ed9f7d23580b9def8d2f93ec40d91653a841d821e54aed856bc6f30939ce386fbdde23a7bb86122113ab3d89fe0ff78 SHA512 67a2e298d56b06cfa7ef0f718889c4e300cccd668e7335f6574e36b929dbf349473ce4c4541a083a703440e8d61abea0551e2e245bfec4dbf95cd174e72114d5
 MISC metadata.xml 1404 BLAKE2B 68d3a914681db790872872cee7114b053aaa118b9eacbf33b02db932d3b970a80b0fc1d79d9e3f836f7d0f8870066bdf78b6b688864cac753d5ddf42a7ad9f9c SHA512 766657a0c9a0d16fa9fc0c052342b65c1f5b32dbbc0eb4e8fb014274b92dd0370dc19a6821ceed3979a1def5f429e1e3f23ccbf2ca443f787a50e00b503acf42
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
index 76e7997e8b71..d0be6977de1d 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 5925d3f3b02c..b80c24563b19 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,13 +3,15 @@ AUX wireshark-2.1.0-sse4_2-r1.patch 498 BLAKE2B 05af1325a8bb709676fc2e205b41790f
 AUX wireshark-2.4-androiddump.patch 1135 BLAKE2B 8126f920def5e6faf4691d639dc3dde7e32aca4b3dd11928a50ddbfdec9b53386957eb473fa93fc21bf791c052a4808b03e00a775d4c1e9f61a1c007c03b6953 SHA512 d18daa46b3ff8f0f4e3e468c65c33fd1bf9fb9a8e90f6318a64cc11b696520b07ccfcbc9921f3c932fcceb809c0406a5cd9773a157ed1bfd10e4c8873215b36b
 AUX wireshark-2.4.3-libsmi.patch 7153 BLAKE2B 33b7237eb213fcb2aab0a9db9c28a22dfbd6d0a3434c5c2dd849415cec7b5cbb3573bb95c8a81224fc5bca639103437aafcfa05ab3554bdfb3c866013e38b19a SHA512 4027b6fc313c2186f4eb2a9cb050dea1687c9cff64a83ec0cec2a122ca588cb6334064a2c46dc9c9d66e8fd41056f27548e7aacb5193f82734b04e15f4a17c67
 AUX wireshark-2.6.0-androiddump-wsutil.patch 640 BLAKE2B 07e8bbb0a892d35fc58d63c6faff9b0aeb08ed0097be31b6dfa5335aedfb53c6d18768848c18f20ef3af47fb1299ec498b3386f5c25ee07153d03ef29d7d0986 SHA512 26f99d8abedf60ec590331bffbef14de59ef6581e70a098b5b93b264c7bfce7ad9208c3037b11d2477ab3a5e7fdb87ff401d759fb665dc078a075cf296a7a034
+AUX wireshark-2.6.0-qtsvg.patch 800 BLAKE2B 767fdc6f54ad226b5b55333bfeb9a0c79d989a274b430a582f7a79406ac424474af2b723ade963a8d52428dfc66686aeb71366d133cdf2b0e714efdde549628a SHA512 fe326b15364ce139ac616ba9e6799d2519b00d67fb6e770c5294e15c8141fcf6d9fb4462e31d609bd98ac15c3a67dedd9e37a2eec42f47c95861aba7dee20f31
+AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
 DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54ded5dcd0396ba97d1cbd99addaeb9670d5a870f5e83c39384230def04c078d676580bded81746753716cb392ee05a SHA512 171047fa36a6cb29d1edb8e28086e24075f8b77581d9f3142fa39af8ae3d6dfe0c2e41a9335ca5d9851578b54ac9e6e74ff5bd92a96af262a5cc7a73857b8b81
 DIST wireshark-2.6.0.tar.xz 28314868 BLAKE2B 2121a667115474ac4b1fe05d50ffc02383bf7a8057ea072480455562c62a75d18f3c6b6886ca1e7345101d15057a67a250a3d2a2050777ff5bb1654279b1ac87 SHA512 a419ed32caeb9f25fc26e345c7baf7d847fee35730c64efad66870a786b26b9f8d5a8665b8b99be88f9cf504f6d9e640584d9849558ff09efc83400588dc6da8
 EBUILD wireshark-2.4.5.ebuild 7380 BLAKE2B 0fd3f07582d42cf9651496978c983c9cfa54b2ee0df52151c04bcb7ffd7c886aecf233598226dc2427ec0fbf6fa7d5d4ca8bf92f361c853a10b72dd625fa72dd SHA512 558350df39da8b7419d63251544900f519d920e120ffa40cdfefc7b088731d2ac6755928758bd4c9379f49b1b00b93f4cda8713601e340647d955cc73e6e590c
 EBUILD wireshark-2.4.6.ebuild 7388 BLAKE2B 1d73922229e3216ee9aeb3f95f964da3aa6afea193e88209df3f91419ba99de6de201538750dd79c3421bd8cf12dcfd1b12022b0be97a21f3e743fea17f70107 SHA512 dc66e5dd25527f9fd7ec05f6d810b4d92f2c138e2337def5571e7a7bcaf6034099ad649869190aa366700e6223e9de09997fa36c6910f9dbbc5e0c736e26a92b
-EBUILD wireshark-2.6.0-r1.ebuild 6642 BLAKE2B 4c4758d2b0f549e650518f8048a067fec34635c052ba3058c5f97d8a68b3ba845758cde26d582485a8a4435c8dd477b434c99d45a26aa8744eeb10269bb684e0 SHA512 2e26c86b1c147fe282cfc5d6abf77ec3ccf27e59422f9d976d7f29a9f2fe227b12736a8ef49584bba2a67bd465d553f8108f6761d26ecf3b382919112b277dc0
+EBUILD wireshark-2.6.0-r1.ebuild 6721 BLAKE2B 438c1c8d3123ff197807d7f61470636e0d56040a795e36d52cefa2b328b865a785168f3aa01469f5addeabee707598ea3141b5409de40c3ab42f94184c1f9eda SHA512 8c7fcd91dd2ff4ceba0ea03db11f9ac1dbb4b2f4340bfab6362bc2967be3a7f38a7a064e0dabf5c0bfa40b67675133a23aa7ead86a4bd07a913fb1b02faa4358
 EBUILD wireshark-2.6.0.ebuild 6657 BLAKE2B b067e041801abaf66207c7841e41d7d359d3e8d5300be0bb78f484e75feae8889c50cd75d566e4c3e32e12728df261f44dccb6784ecab7da8ac67eb9fb1675b5 SHA512 d213869467b91e8b7d4bb176441d2905bb7de877ae88651b1e8f4f16cb54c86b0eb189efdf8b0387bfc694cf61c0f6978f655639d77ea469ce1788e6f94985c6
-EBUILD wireshark-99999999.ebuild 6520 BLAKE2B 78ceeee60594acab089f13dd8c6b0f22b4a1f954b34e1d2647f180e25bd36bb3aac95d3027c52bc0d87d765b3406baf0f5dc64e9ec54c9e1d39fafebb0bd2ac3 SHA512 88a9cef54e5d0b1ba3e2bd6743caaf7a244eb55e43ca58baa1846dcdbc6bff9f3aafe147920ce8196623793717e3b6fb9665ba93700429998cde61aeb37d3b9a
+EBUILD wireshark-99999999.ebuild 6599 BLAKE2B 88bd901752d603d201d8f5cedaa986b70c19f934f3998003d8f14039eb9b86dfda8983a5a987f70efdb32fec3a2075e0059492d82b66f8ae9510a2475a434f43 SHA512 8b3d5fae3df5f2ca4cfcdd9fcfd110dbe88e7b9a283f2574242ccd7ef39aac44f3957d1488dc944166af7445aef6dff2d6f0c7371a5694a67ca877806371fc5f
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch
new file mode 100644
index 000000000000..633277275901
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -926,14 +926,12 @@
+ 			Qt5LinguistTools
+ 			Qt5Multimedia
+ 			Qt5PrintSupport
+-			Qt5Svg
+ 			Qt5Widgets
+ 		)
+ 		set(Qt5Core_OPTIONS REQUIRED)
+ 		set(Qt5LinguistTools_OPTIONS REQUIRED)
+ 		set(Qt5Multimedia_OPTIONS REQUIRED)
+ 		set(Qt5PrintSupport_OPTIONS REQUIRED)
+-		set(Qt5Svg_OPTIONS REQUIRED)
+ 		set(Qt5Widgets_OPTIONS REQUIRED)
+ 		if (APPLE)
+ 			set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
+@@ -1229,11 +1227,6 @@
+ 		# That's the name autofoo uses
+ 		set(QT_MULTIMEDIA_LIB 1)
+ 	endif()
+-	if(Qt5Svg_FOUND)
+-		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
+-		# That's the name autofoo uses
+-		set(QT_SVG_LIB 1)
+-	endif()
+ 	if(Qt5MacExtras_FOUND)
+ 		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+ 		# That's the name autofoo uses
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch
new file mode 100644
index 000000000000..fe17609bf619
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3019,7 +3019,7 @@
+ 
+ endif()
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
++if(CMAKE_SYSTEM_NAME STREQUAL "Red Hat")
+ 	find_program(RPMBUILD_EXECUTABLE rpmbuild)
+ 	find_program(GIT_EXECUTABLE git)
+ endif()
diff --git a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
index 40b8f06bf924..23ffa310a9ed 100644
--- a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
@@ -89,6 +89,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
 	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-99999999-androiddump.patch
 )
 
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index c216e52d33d5..7ca08d8b9246 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -88,6 +88,8 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
 	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 )
 
 pkg_setup() {