Version update, fixes, drop Python 2

2 files changed, 12 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b28136838dde..5b383e7e15a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,17 @@
 pkgbase = scapy-git
 	pkgdesc = Powerful interactive packet manipulation program written in Python
-	pkgver = 2.4.0.dev43
+	pkgver = 2.4.5rc1.dev297
 	pkgrel = 1
 	url = http://www.secdev.org/projects/scapy/
 	arch = any
 	license = GPL2
-	checkdepends = python2-cryptography
-	checkdepends = python2-pyx
-	checkdepends = python2-matplotlib
 	checkdepends = python-cryptography
 	checkdepends = python-pyx
 	checkdepends = python-matplotlib
 	checkdepends = graphviz
 	checkdepends = sox
+	checkdepends = tcpdump
 	makedepends = git
-	makedepends = tcpdump
-	makedepends = python2
 	makedepends = python
 	source = scapy-git::git+https://github.com/secdev/scapy
 	sha256sums = SKIP
@@ -38,16 +34,3 @@ pkgname = python-scapy-git
 	optdepends = sox: for VOIP support
 	provides = python-scapy
 	conflicts = python-scapy
-
-pkgname = python2-scapy-git
-	pkgdesc = Powerful interactive packet manipulation program written in Python (library)
-	depends = tcpdump
-	depends = python2
-	optdepends = python2-cryptography: WEP, IPsec and SSL/TLS support
-	optdepends = python2-pyx: psdump() and pdfdump() functions
-	optdepends = python2-matplotlib: plotting support
-	optdepends = graphviz: conversations() method support
-	optdepends = sox: for VOIP support
-	provides = python2-scapy
-	conflicts = python2-scapy
-
diff --git a/PKGBUILD b/PKGBUILD
index df64e6e1ecad..cea64c0487b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,14 @@
 # Contributor: s1gma,shirokuro
 
 pkgbase=scapy-git
-pkgname=('scapy-git' 'python-scapy-git' 'python2-scapy-git')
-pkgver=2.4.0.dev43
+pkgname=('scapy-git' 'python-scapy-git')
+pkgver=2.4.5rc1.dev297
 pkgrel=1
 pkgdesc='Powerful interactive packet manipulation program written in Python'
 url='http://www.secdev.org/projects/scapy/'
-makedepends=('git' 'tcpdump' 'python2' 'python')
-checkdepends=('python2-cryptography' 'python2-pyx' 'python2-matplotlib'
-              'python-cryptography' 'python-pyx' 'python-matplotlib'
-              'graphviz' 'sox')
+makedepends=('git' 'python')
+checkdepends=('python-cryptography' 'python-pyx' 'python-matplotlib'
+              'graphviz' 'sox' 'tcpdump')
 arch=('any')
 license=('GPL2')
 source=(${pkgbase}::git+https://github.com/secdev/scapy)
@@ -20,33 +19,18 @@ sha256sums=('SKIP')
 
 pkgver() {
   cd ${pkgbase}
-  PYTHONPATH=. python2 -c "print __import__('scapy').VERSION"
-}
-
-prepare() {
-  cp -a ${pkgbase}{,-py2}
-  cd ${pkgbase}-py2
-  sed -e 's|env python|env python2|g' -i doc/scapy/*.rst scapy/contrib/*.py setup.py \
-    run_scapy scapy/pipetool.py scapy/tools/check_asdis.py scapy/layers/*.py bin/*
+  python setup.py --version
 }
 
 build() {
-  (cd ${pkgbase}-py2
-    python2 setup.py build
-  )
-  (cd ${pkgbase}
-    python setup.py build
-  )
+  cd ${pkgbase}
+  python setup.py build
 }
 
 check() {
   # Run only main tests, without network access
-  (cd ${pkgbase}-py2/test
-    ./run_tests_py2 -K netaccess -F
-  )
-  (cd ${pkgbase}/test
-    ./run_tests_py3 -K netaccess -F
-  )
+  cd ${pkgbase}/test
+  ./run_tests -3 -K netaccess -F
 }
 
 package_scapy-git() {
@@ -77,20 +61,4 @@ package_python-scapy-git() {
   rm -r "${pkgdir}"{/usr/bin,/usr/share/man}
 }
 
-package_python2-scapy-git() {
-  pkgdesc+=' (library)'
-  depends=('tcpdump' 'python2')
-  optdepends=('python2-cryptography: WEP, IPsec and SSL/TLS support'
-              'python2-pyx: psdump() and pdfdump() functions'
-              'python2-matplotlib: plotting support'
-              'graphviz: conversations() method support'
-              'sox: for VOIP support')
-  provides=('python2-scapy')
-  conflicts=('python2-scapy')
-  cd ${pkgbase}-py2
-  python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
-  install -Dm 644 doc/scapy/*.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
-  rm -r "${pkgdir}"{/usr/bin,/usr/share/man}
-}
-
 # vim: ts=2 sw=2 et: