From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- net-analyzer/ostinato/Manifest | 7 ++-- .../files/ostinato-0.9_p20180522-buildfix.patch | 17 ---------- net-analyzer/ostinato/metadata.xml | 2 +- .../ostinato/ostinato-0.9_p20180522.ebuild | 39 ---------------------- net-analyzer/ostinato/ostinato-1.1.ebuild | 35 +++++++++++++++++++ 5 files changed, 39 insertions(+), 61 deletions(-) delete mode 100644 net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch delete mode 100644 net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild create mode 100644 net-analyzer/ostinato/ostinato-1.1.ebuild (limited to 'net-analyzer/ostinato') diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest index 34f33697b3dd..aa897a322cfc 100644 --- a/net-analyzer/ostinato/Manifest +++ b/net-analyzer/ostinato/Manifest @@ -1,5 +1,4 @@ -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.9_p20180522.tar.gz 424128 BLAKE2B 69a15e523986cd34f89669fab0ed64987f68ea7d82d481de418c2d86f3b325b5c1ff9081db8c77532b603b01f504c37c24a4f7f5b7244657cac8b2f707bc7bdf SHA512 7d8359b193c98165ea376ad0ad57e01b782e35a7b887465d74c67ae1cd434036e8beb67593c569e15a87d5d0c7f602c9f01acf068e9ffff0c0496ab4f889a83a -EBUILD ostinato-0.9_p20180522.ebuild 843 BLAKE2B 63051fb75faef8a8c2693c543dbf3e3982e0e8eeb0d92136f4a0e9b8dfa112cd52f86629e6cd2b39b362a8a12300455e37a2a0f8a3685a591e67292de223b0ab SHA512 49b6402c5595e811f3123ecb295cd6201f2bf8fe2d8d955bc3cc4b744d6926aac1735ef0df7ee72b20bd3868212f619e3d79f0364271e5968de84a1a0a016689 -MISC metadata.xml 325 BLAKE2B 7deccc14079e605af5cd4a154a6d7ba4f69b2c7472c0f3ebb59c968bbb3c992216b0a367973d6ed729b0b117594ff47d1e9401c1750f5a6627aefca6008aab5f SHA512 65ed2d54f5a181004ea4900cd1b26b632fe57809f4903f9e4bb79b3440e7e3d72effc62725be9e788922e37b38f34b4363c30a3adda9f9483c0a983ff2f9fe09 +DIST ostinato-1.1.tar.gz 612589 BLAKE2B 2244b3be5649e0623139b667c61a169a3e7f5dae6f022d6550cd825f1af8fa2c2d82210af1f381ae53af19fff9a56d58b30a406fc1f3d89c73bc7e3d0ab18fa4 SHA512 a45e157d155d4f2efe9a1594a140647b5cbd7264985b15a9ed47d86198c9df9d763170097dcfd40fae1317206e53c9155f08c48c747cce458e0cae7f3a841449 +EBUILD ostinato-1.1.ebuild 739 BLAKE2B aa23b50a213fced2e5b4a52a1c61f436308c809450375fe5178046a0aa315346131d897cd75b541d7a10a23d4deed2afd3fbf4f7f7b74daefb9cbb83327426ce SHA512 3ffd38bd7138f362055aa3310d568fdd62f5274d6e999c17c92930a8fbded320bb3e87ffadb09c37afbf61c4c69cdb038e42fd945eade40284d4c471047d465f +MISC metadata.xml 329 BLAKE2B 3618e866706468ccbdbb03e22088df81922a7997a04a0a7f7a011aa6df7f3653462569b1384ce9e12ccebe742df9c3f417dab26dc6983c48f1b146c731d623f2 SHA512 9382245a5216d3373ce5fc0fd926f5d1aa4669bb80636db967882eda3088f6a6fa0c1a6df75a42de456d7646a10061acfbae251cfae8efc5f53dec597463d732 diff --git a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch deleted file mode 100644 index ff09d689ae5c..000000000000 --- a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 - #include - -+template <> inline Q_DECL_CONSTEXPR unsigned long qbswap(unsigned long source) { -+ if (sizeof(unsigned long) == 8) { -+ return qbswap(quint64(source)); -+ } else { -+ return qbswap(quint32(source)); -+ } -+} -+ - MldProtocol::MldProtocol(StreamBase *stream, AbstractProtocol *parent) - : GmpProtocol(stream, parent) - { diff --git a/net-analyzer/ostinato/metadata.xml b/net-analyzer/ostinato/metadata.xml index fb90fd94be6f..e63760e84925 100644 --- a/net-analyzer/ostinato/metadata.xml +++ b/net-analyzer/ostinato/metadata.xml @@ -6,6 +6,6 @@ Rick Farina - ostinato + pstavirs/ostinato diff --git a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild b/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild deleted file mode 100644 index e2e38eaf0514..000000000000 --- a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -COMMIT=9a4e7e7550c6b20a8f0f1393a55036492c1b7703 -inherit qmake-utils - -DESCRIPTION="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 -} diff --git a/net-analyzer/ostinato/ostinato-1.1.ebuild b/net-analyzer/ostinato/ostinato-1.1.ebuild new file mode 100644 index 000000000000..9dba7331941b --- /dev/null +++ b/net-analyzer/ostinato/ostinato-1.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils + +DESCRIPTION="Packet generator and analyzer" +HOMEPAGE="https://ostinato.org/" +SRC_URI="https://github.com/pstavirs/${PN}/archive/v${PV}.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}" + +PATCHES=( + "${FILESDIR}/${PN}-0.9_p20180522-no-modeltest.patch" +) + +src_configure() { + eqmake5 PREFIX="${ED}/usr" ost.pro +} -- cgit v1.2.3