commit: c26c406db8556a4c1efe4a6b29633907bd2dcd0b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 11 23:21:02 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 12:24:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c26c406d
net-analyzer/ostinato: Add Qt5-based snapshot
Package-Manager: Portage-2.3.36, Repoman-2.3.9
net-analyzer/ostinato/Manifest | 1 +
.../files/ostinato-0.9_p20180522-buildfix.patch | 17 ++++++++++
.../ostinato-0.9_p20180522-no-modeltest.patch | 10 ++++++
.../ostinato/ostinato-0.9_p20180522.ebuild | 38 ++++++++++++++++++++++
4 files changed, 66 insertions(+)
diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest
index 3a6268e8809..22111433f3b 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1,3 +1,4 @@
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
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 00000000000..ff09d689ae5
--- /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 00000000000..5e7733aeed1
--- /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 00000000000..9bdd58c8fbc
--- /dev/null
+++ b/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild
@@ -0,0 +1,38 @@
+# 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=""
+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/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
+}
