commit: 59b5589e102660a7f96796afa33a1db8dccb1499 Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> AuthorDate: Thu Feb 25 17:19:54 2021 +0000 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> CommitDate: Thu Feb 25 17:20:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59b5589e
net-analyzer/ostinato: bump Package-Manager: Portage-3.0.15, Repoman-3.0.2 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> net-analyzer/ostinato/Manifest | 2 +- .../files/ostinato-0.9_p20180522-buildfix.patch | 17 ----------------- net-analyzer/ostinato/metadata.xml | 2 +- ...stinato-0.9_p20180522.ebuild => ostinato-1.1.ebuild} | 12 ++++-------- 4 files changed, 6 insertions(+), 27 deletions(-) diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest index 44c30549ab5..563c348f41f 100644 --- a/net-analyzer/ostinato/Manifest +++ b/net-analyzer/ostinato/Manifest @@ -1 +1 @@ -DIST ostinato-0.9_p20180522.tar.gz 424128 BLAKE2B 69a15e523986cd34f89669fab0ed64987f68ea7d82d481de418c2d86f3b325b5c1ff9081db8c77532b603b01f504c37c24a4f7f5b7244657cac8b2f707bc7bdf SHA512 7d8359b193c98165ea376ad0ad57e01b782e35a7b887465d74c67ae1cd434036e8beb67593c569e15a87d5d0c7f602c9f01acf068e9ffff0c0496ab4f889a83a +DIST ostinato-1.1.tar.gz 612589 BLAKE2B 2244b3be5649e0623139b667c61a169a3e7f5dae6f022d6550cd825f1af8fa2c2d82210af1f381ae53af19fff9a56d58b30a406fc1f3d89c73bc7e3d0ab18fa4 SHA512 a45e157d155d4f2efe9a1594a140647b5cbd7264985b15a9ed47d86198c9df9d763170097dcfd40fae1317206e53c9155f08c48c747cce458e0cae7f3a841449 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 ff09d689ae5..00000000000 --- 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 <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/metadata.xml b/net-analyzer/ostinato/metadata.xml index fb90fd94be6..e63760e8492 100644 --- a/net-analyzer/ostinato/metadata.xml +++ b/net-analyzer/ostinato/metadata.xml @@ -6,6 +6,6 @@ <name>Rick Farina</name> </maintainer> <upstream> - <remote-id type="google-code">ostinato</remote-id> + <remote-id type="github">pstavirs/ostinato</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild b/net-analyzer/ostinato/ostinato-1.1.ebuild similarity index 63% rename from net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild rename to net-analyzer/ostinato/ostinato-1.1.ebuild index e2e38eaf051..9dba7331941 100644 --- a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild +++ b/net-analyzer/ostinato/ostinato-1.1.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 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" +SRC_URI="https://github.com/pstavirs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -#KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="" #https://github.com/pstavirs/ostinato/issues/173 @@ -27,11 +26,8 @@ DEPEND=" " RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-${COMMIT}" - PATCHES=( - "${FILESDIR}/${P}-buildfix.patch" - "${FILESDIR}/${P}-no-modeltest.patch" + "${FILESDIR}/${PN}-0.9_p20180522-no-modeltest.patch" ) src_configure() {