pwntools: 4.0.0 bump, fork and fix Gentoo python targets

app-exploits/pwntools/Manifest

@@ -1 +1,2 @@
 DIST pwntools-3.13.0.tar.gz 1141340 BLAKE2B 9c137834076dc31f5879f92927a9e9ff2242f1a2ee14b3499f1bdb3c54632f38f6ac62e8b6736c8a12e8a7a7f2c13889a464696c9913f8387c8455d7dfe039ad SHA512 6480fef7a2ed2b9dcee15fb8cddbbb4f33fbb9e61648faad2e6736e15218022187d22bb41d832148c76ebae07f512e46784c08994a040fd330856dfb810a033d
+DIST pwntools-4.0.0.tar.gz 3986846 BLAKE2B 117fc85c22976dbac41f326b9545c9f4141af61b6408118b74defd0bd0aa4a084b00dd64f723ad79fe0e1a1aecdcf4995bff4c6cbd3ed3d2c72c94d104666013 SHA512 23c566ff5682bea2e0bb0b6b39ff2d211e4cba5a47a6b7d1d9870eef5ffaaf8d37f2826106d7821ef3969de76b6e0e994bd3d27314c837d4be2e5702d0925852

app-exploits/pwntools/files/pwntools-4.0.0_do_not_mess_with_docs.patch

@@ -0,0 +1,25 @@
+--- a/setup.py.orig	2020-01-10 12:01:28.688051015 +0800
++++ b/setup.py	2020-01-10 12:02:10.370053813 +0800
+@@ -70,14 +70,6 @@
+     print("$ apt-get install python-dev", file=sys.stderr)
+     sys.exit(-1)
+ 
+-# Convert README.md to reStructuredText for PyPI
+-long_description = ''
+-try:
+-    long_description = subprocess.check_output(['pandoc', 'README.md', '--to=rst'], universal_newlines=True)
+-except Exception as e:
+-    print("Failed to convert README.md through pandoc, proceeding anyway", file=sys.stderr)
+-    traceback.print_exc()
+-
+ setup(
+     name                 = 'pwntools',
+     python_requires      = '>=2.7',
+@@ -99,7 +91,6 @@
+     entry_points = {'console_scripts': console_scripts},
+     scripts              = glob.glob("bin/*"),
+     description          = "Pwntools CTF framework and exploit development library.",
+-    long_description     = long_description,
+     author               = "Gallopsled et al.",
+     author_email         = "pwntools-users@googlegroups.com",
+     url                  = 'https://pwntools.com',

app-exploits/pwntools/pwntools-4.0.0.ebuild

@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="CTF framework and exploit development library"
+HOMEPAGE="https://github.com/Gallopsled/pwntools"
+SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+#Most is under an MIT license, but a few pieces are under GPL or a BSD 2-clause licence
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+#REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+#${PYTHON_DEPS}
+RDEPEND="
+	>=dev-python/paramiko-1.15.2[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyelftools-0.2.4[${PYTHON_USEDEP}]
+	dev-libs/capstone[python,${PYTHON_USEDEP}]
+	!!dev-libs/capstone-bindings
+	>=app-exploits/ROPgadget-5.3[${PYTHON_USEDEP}]
+	>=dev-python/pyserial-2.7[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+	dev-util/unicorn[python,unicorn_targets_x86(+),${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}_do_not_mess_with_docs.patch"
+	"${FILESDIR}/${PN}-3.13.0_update_deps.patch"
+)

dev-python/intervaltree/Manifest

@@ -0,0 +1 @@
+DIST intervaltree-3.0.2.tar.gz 30663 BLAKE2B b6d5e7a029e1d1aeec60eaf28c1e40707c655f0eca7ce889a9c0d85a9003ac262c3aa49c396b4c42ebf70bb63157e098addec69050d01ae42a6ba37ea76e1ea5 SHA512 51d6aa302c95c9a573bcf594de390037ec1a6d674061e6a0b4025fa889dfd0187e37bc0331f13d6703340973e4c539aa1349431b14c742de9d2050cbb53d8255

dev-python/intervaltree/intervaltree-3.0.2.ebuild

@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Editable interval tree data structure for Python 2 and 3"
+HOMEPAGE="https://pypi.org/project/intervaltree/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/sortedcontainers-2.0[${PYTHON_USEDEP}]"
+#sortedcontainers >= 2.0, < 3.0']
+
+distutils_enable_tests pytest

dev-python/intervaltree/intervaltree-9999.ebuild

@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$ 
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Editable interval tree data structure for Python 2 and 3"
-HOMEPAGE="https://github.com/chaimleib/intervaltree"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/chaimleib/intervaltree.git"
-EGIT_CHECKOUT_DIR="${WORKDIR}/intervaltree"
-S="${WORKDIR}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"

dev-python/intervaltree/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">intervaltree</remote-id>
+	</upstream>
+</pkgmetadata>

profiles/pentoo/base/package.accept_keywords/dev-python

@@ -326,7 +326,8 @@ dev-python/splinter
 ~dev-python/backcall-0.1.0
 
 # required by pwntools (argument)
-=dev-python/intervaltree-2.1*
+=dev-python/intervaltree-3.0*
+=dev-python/sortedcontainers-2*
 
 # required by net-analyzer/tplmap
 ~dev-python/wsgiref-0.1.2