gentoo resync : 30.06.2018

4 files changed, 70 insertions, 0 deletions

diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest
index 5bb0ae11d87b..cf3455d662d2 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1,7 +1,11 @@
+AUX ostinato-0.9_p20180522-buildfix.patch 542 BLAKE2B 7916e581c50b3090415cfdd2607e9614e9fffd057e2b2c8d32458fa2582e30ad37c4c334fb7a610d059e5a4951a376ebcc5795511203333333c102abfd7be1ab SHA512 b7647a4d485e5a814cc75cc86bf1552c78d1498363eb1fafcb0ec17dc9c2191d93744dd6d58c47b704ed3e8f756bab5480b31b67ce5e1ace250e64c4523130b7
+AUX ostinato-0.9_p20180522-no-modeltest.patch 243 BLAKE2B bf382374a803ac4be4e9b00e216ce61c918e3f097b3034337fdeeadeb131e7a0ed8b028b1b08f107d94438baad35be6d7606874439850ddb9f0e5176ffa28a15 SHA512 b82fed38f8b4bccca3e6de599508c1c65c8bcf83dc88ca6e4c383f04eadc6fa3c3bfd2ddf31e5eaa26b8445f674e76600712659705bd2061a1ed0646af022c6b
 DIST ostinato-0.8.tar.gz 424104 BLAKE2B 5244ac9577da3fc99b714044a349e4003f0e64034fad04e241b43288a234f86f282ba0169c7e27c358d7ee3f4dc255b2408ef23f030d25f1edfec891e8ae17f7 SHA512 ecb3581736bd8dff44fe21082c270febc2ead4530cfb57997f218bd0b61a85993208937729374dd09c67fdc24eb2b9adfe5b3750ee6daef90b1e7dac2ea0737b
 DIST ostinato-0.9.tar.gz 413756 BLAKE2B cc1cb6d4db614b1968c27d7cdbebb977f39e6be8ec1a39b08f7e34d9a1a4d6b7c0c034f245b6b562c72b5dbdba9fc04c03b1cfc0c01044c249bcc2bc67af357d SHA512 a50f6e20d8a2a4d76ca43a89feaa774778981377ce1f4c731ad8b1a97aa658013082fb85cc3f4dfdd888d708c45c8093e55facaa7f02cecbd2ce5228f57e2e14
+DIST ostinato-0.9_p20180522.tar.gz 424128 BLAKE2B 69a15e523986cd34f89669fab0ed64987f68ea7d82d481de418c2d86f3b325b5c1ff9081db8c77532b603b01f504c37c24a4f7f5b7244657cac8b2f707bc7bdf SHA512 7d8359b193c98165ea376ad0ad57e01b782e35a7b887465d74c67ae1cd434036e8beb67593c569e15a87d5d0c7f602c9f01acf068e9ffff0c0496ab4f889a83a
 DIST ostinato-src-0.5.1.tar.gz 291529 BLAKE2B 207a3b423040e82042e7e68e2c7ffaf304a0c7e7d1578a994caf090ee934e10f169b9fce96724c0527268fb9f656b25bf3baa19b5f1ab6a06ffc2b8925b1c952 SHA512 d06b59dc2129aba01e5a42a677339d6e8f353f9c7c027226e66c8a5af94ecb48e8450e7770ae5e179131fa4cfeefcc827fb9a18be4294ddfcd7a471ec26ee06a
 EBUILD ostinato-0.5.1.ebuild 508 BLAKE2B 1857e47c74bd91eea56c551e95e63b667388ecb389be9939d4e2eb37898b84416d9b151bd71952567973fdbdd22bc08f85fdfc963fc208ff716e461c45542905 SHA512 589777f1c32dbeb62411f028527259c57fd86e5e9bf27b527650d517c68e9c05a77d11ecb213d88610f468db4a756d94c817985dff618a260a7110427bbe216d
 EBUILD ostinato-0.8.ebuild 550 BLAKE2B a4e7b8e65a2278db94b3b5d284b97b8fdbeab2c70e9c81e1cba9ce90768e65f818a0a2b77ef5ceeb181fab1364682f8b45b2f5012cc3fda4aa70d4103ba97a3c SHA512 a7d654097e7fbd013e1413ebb471b6b27abfeecc0d26f98f49a424e47c58cd9ea905fe19e49b15043c5ec8c8a7166c9f56cbf5b8b6210acd5863bd18cafbb82d
 EBUILD ostinato-0.9.ebuild 654 BLAKE2B 71bac7438fc30945a49181cdf26b31a4b5f61d9a2986acd11ef5895f8c2c623d3c54a55a2c733db9b68ddfb27bb00c4a92ad0793bbdbc9a2cbf41cd5e00018f7 SHA512 cfcf4573ac143eb6f8d07ef0e49a6539fadcfa8d68214dcef455bec042f45af335e6b3bbf8eaae0fd30ae1a1d9402c7b686f45b9896da721d9227ded7c1f4023
+EBUILD ostinato-0.9_p20180522.ebuild 847 BLAKE2B 7314d2836b45cfa187f21362d4958ff095e99d5720448cf0e631e989302da4acf612778c5025686e4c4200ef1911b89c2cfae320b316312ea498add1a4d03d7a SHA512 dfe64994620dffcfb52100c6974592340d0af4318a749293c1608ad3bfec9ba6ab5088349eba41fe95e7eadd018d7304eeb0b853ce16044f52d5df92ca3bcca8
 MISC metadata.xml 325 BLAKE2B 7deccc14079e605af5cd4a154a6d7ba4f69b2c7472c0f3ebb59c968bbb3c992216b0a367973d6ed729b0b117594ff47d1e9401c1750f5a6627aefca6008aab5f SHA512 65ed2d54f5a181004ea4900cd1b26b632fe57809f4903f9e4bb79b3440e7e3d72effc62725be9e788922e37b38f34b4363c30a3adda9f9483c0a983ff2f9fe09
diff --git a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch
new file mode 100644
index 000000000000..ff09d689ae5c
--- /dev/null
+++ b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch
@@ -0,0 +1,17 @@
+--- a/common/mld.cpp	2018-05-22 18:18:21.000000000 +0200
++++ b/common/mld.cpp	2018-06-26 13:59:58.562569302 +0200
+@@ -24,6 +24,14 @@
+ #include <QHostAddress>
+ #include <QStringList>
+ 
++template <> inline Q_DECL_CONSTEXPR unsigned long qbswap<unsigned long>(unsigned long source) {
++  if (sizeof(unsigned long) == 8) {
++    return qbswap<quint64>(quint64(source));
++  } else {
++    return qbswap<quint32>(quint32(source));
++  }
++}
++
+ MldProtocol::MldProtocol(StreamBase *stream, AbstractProtocol *parent)
+     : GmpProtocol(stream, parent)
+ {
diff --git a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-no-modeltest.patch b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-no-modeltest.patch
new file mode 100644
index 000000000000..5e7733aeed10
--- /dev/null
+++ b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-no-modeltest.patch
@@ -0,0 +1,10 @@
+--- a/extra/extra.pro	2018-05-22 18:18:21.000000000 +0200
++++ b/extra/extra.pro	2018-06-26 14:15:49.162937000 +0200
+@@ -1,7 +1,3 @@
+ TEMPLATE = subdirs
+ SUBDIRS = \
+     qhexedit2
+-
+-greaterThan(QT_MINOR_VERSION, 6) {
+-SUBDIRS += modeltest
+-}
diff --git a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild b/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild
new file mode 100644
index 000000000000..1beae2abfc9f
--- /dev/null
+++ b/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=9a4e7e7550c6b20a8f0f1393a55036492c1b7703
+inherit qmake-utils
+
+DESCRIPTION="A packet generator and analyzer"
+HOMEPAGE="https://ostinato.org/"
+SRC_URI="https://github.com/pstavirs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+#https://github.com/pstavirs/ostinato/issues/173
+# libpcap dep is versioned to pull in the fix for #602098
+DEPEND="
+	dev-libs/protobuf:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	>=net-libs/libpcap-1.8.1-r2
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-buildfix.patch"
+	"${FILESDIR}/${P}-no-modeltest.patch"
+)
+
+src_configure(){
+	eqmake5 PREFIX="${ED}/usr" ost.pro
+}