From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1280306-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 0C95E1382C5
for <garchives@archives.gentoo.org>; Sun, 9 May 2021 23:53:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 48925E070D;
Sun, 9 May 2021 23:53:32 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 26743E070D
for <gentoo-commits@lists.gentoo.org>; Sun, 9 May 2021 23:53:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 92EC9340CDF
for <gentoo-commits@lists.gentoo.org>; Sun, 9 May 2021 23:53:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 110C759C
for <gentoo-commits@lists.gentoo.org>; Sun, 9 May 2021 23:53:29 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1620604396.be5688bbcfe8eb7b6ac06192dda990067aa5bcae.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/scapy/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/scapy/Manifest net-analyzer/scapy/scapy-2.4.5.ebuild net-analyzer/scapy/scapy-9999.ebuild
X-VCS-Directories: net-analyzer/scapy/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: be5688bbcfe8eb7b6ac06192dda990067aa5bcae
X-VCS-Branch: master
Date: Sun, 9 May 2021 23:53:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 8cee065a-3a56-4d17-ade3-81834a118a15
X-Archives-Hash: beb222e4aab12cf6daf594f8d2aa7cd4
commit: be5688bbcfe8eb7b6ac06192dda990067aa5bcae
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 9 23:52:19 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 9 23:53:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be5688bb
net-analyzer/scapy: add 2.4.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/scapy/Manifest | 1 +
.../scapy/{scapy-9999.ebuild => scapy-2.4.5.ebuild} | 17 +++++++++++------
net-analyzer/scapy/scapy-9999.ebuild | 5 +++--
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 60e58090c7c..271529673f5 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1 +1,2 @@
DIST scapy-2.4.4.tar.gz 3240890 BLAKE2B 38b4fc0c34f229bb33f4d488ae9ba20905db572e3dd3caa15a92e8a33ba7305ba86a2b32a2664779c5085e53d44b4c55336d7afa8d65b90ffa3babcdc94bff25 SHA512 b8ad138ae2563967af07d123339ac73468fadb8f7687123aed364ad6d45198e9039314e17a155c37d01ef084e25571c587330dfd21777527110342c01821a389
+DIST scapy-2.4.5.tar.gz 3323309 BLAKE2B af94b3ec6324c4544aca25f63bcca8aa60a3b1cbbf132d3ed07b5bc73b95e4298bf250e65157bdb7851226fd0ac039367892a9a14d844e5815832ad4ab556819 SHA512 b5ccd689f7bd4fbbb86921a35360b94ec7a738b494f16e4764828689835296016bc476825add798406e4d32761d8df90b41ce7e38049afdabf98397b1bf5982a
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-2.4.5.ebuild
similarity index 74%
copy from net-analyzer/scapy/scapy-9999.ebuild
copy to net-analyzer/scapy/scapy-2.4.5.ebuild
index ec171fbddec..2c8170223ff 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.5.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
PYTHON_COMPAT=( python3_{7,8,9} )
DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 git-r3 readme.gentoo-r1
+inherit distutils-r1 readme.gentoo-r1
DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
-EGIT_REPO_URI="https://github.com/secdev/${PN}"
+SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
-S=${WORKDIR}/${P/_/}
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
DOC_CONTENTS="
Scapy has optional support for the following packages:
@@ -31,7 +32,11 @@ Scapy has optional support for the following packages:
"
src_prepare() {
- echo ${PV/_/} > ${PN}/VERSION || die
+ if ! [[ -f ${PN}/VERSION ]]; then
+ echo ${PV} > ${PN}/VERSION || die
+ else
+ die
+ fi
distutils-r1_src_prepare
}
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index ec171fbddec..ac3fd1dccb9 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-9999.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
PYTHON_COMPAT=( python3_{7,8,9} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1 git-r3 readme.gentoo-r1
@@ -9,11 +10,11 @@ inherit distutils-r1 git-r3 readme.gentoo-r1
DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy"
EGIT_REPO_URI="https://github.com/secdev/${PN}"
+S="${WORKDIR}"/${P/_/}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
-S=${WORKDIR}/${P/_/}
+
DOC_CONTENTS="
Scapy has optional support for the following packages: