summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Haustein <mario.haustein@hrz.tu-chemnitz.de>2023-01-31 22:39:10 +0100
committerSam James <sam@gentoo.org>2023-02-01 07:25:43 +0000
commit2c49cc00ae62e5161c8ad4b0e105d6d0456a4752 (patch)
tree8332e177390386c5775fd7f7bd56c32c5ebe854a /dev-util
parentsci-geosciences/grass: fix x11-libs/cairo dep (diff)
downloadgentoo-2c49cc00ae62e5161c8ad4b0e105d6d0456a4752.tar.gz
gentoo-2c49cc00ae62e5161c8ad4b0e105d6d0456a4752.tar.bz2
gentoo-2c49cc00ae62e5161c8ad4b0e105d6d0456a4752.zip
dev-util/pwntools: don't mess up /usr/bin with file collision
Closes: https://bugs.gentoo.org/892724 Signed-off-by: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/29364 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/pwntools/Manifest4
-rw-r--r--dev-util/pwntools/pwntools-4.10.0_beta0-r2.ebuild (renamed from dev-util/pwntools/pwntools-4.10.0_beta0-r1.ebuild)8
-rw-r--r--dev-util/pwntools/pwntools-4.9.0-r2.ebuild (renamed from dev-util/pwntools/pwntools-4.9.0-r1.ebuild)8
-rw-r--r--dev-util/pwntools/pwntools-9999.ebuild8
4 files changed, 23 insertions, 5 deletions
diff --git a/dev-util/pwntools/Manifest b/dev-util/pwntools/Manifest
index 43f0be0443ed..4a83d4346459 100644
--- a/dev-util/pwntools/Manifest
+++ b/dev-util/pwntools/Manifest
@@ -1,2 +1,2 @@
-DIST pwntools-4.10.0_beta0.tar.gz 4228046 BLAKE2B 3b03b3a9af12b23405af3d59fffa6c0baf430d9c8fc9c4180d43fb015b5707e317189a4d38091de02a688da34756aa9dd1ba8ae264857556db142880141f7d61 SHA512 9806509deff098e1d0f4f3cec335191f536d3e59d620acb7966aafccc64ebc84a28ee77c91b2aac93c8ba13a36fc77968dfe56852b1fc593a1ca2d2e568d82c6
-DIST pwntools-4.9.0.tar.gz 4218616 BLAKE2B d811a96943fbe80a4082bdff412aee5df02250846189e6300e99a6630bc02906053e728ca9904b27ddc546ad2c3612818a046b4d6418d8ebf682df600b99bc99 SHA512 8ed404dc556383712ad4de799fbff09f51735065cac07ca909f1430b22e6e9574d870aaaa4a7ce0e22d5f6edb18b956847a7aaf4dd6cf0b44fbfcf58e32497fb
+DIST pwntools-4.10.0_beta0.gh.tar.gz 4228046 BLAKE2B 3b03b3a9af12b23405af3d59fffa6c0baf430d9c8fc9c4180d43fb015b5707e317189a4d38091de02a688da34756aa9dd1ba8ae264857556db142880141f7d61 SHA512 9806509deff098e1d0f4f3cec335191f536d3e59d620acb7966aafccc64ebc84a28ee77c91b2aac93c8ba13a36fc77968dfe56852b1fc593a1ca2d2e568d82c6
+DIST pwntools-4.9.0.gh.tar.gz 4218616 BLAKE2B d811a96943fbe80a4082bdff412aee5df02250846189e6300e99a6630bc02906053e728ca9904b27ddc546ad2c3612818a046b4d6418d8ebf682df600b99bc99 SHA512 8ed404dc556383712ad4de799fbff09f51735065cac07ca909f1430b22e6e9574d870aaaa4a7ce0e22d5f6edb18b956847a7aaf4dd6cf0b44fbfcf58e32497fb
diff --git a/dev-util/pwntools/pwntools-4.10.0_beta0-r1.ebuild b/dev-util/pwntools/pwntools-4.10.0_beta0-r2.ebuild
index 765bf018a914..716ef0f390c1 100644
--- a/dev-util/pwntools/pwntools-4.10.0_beta0-r1.ebuild
+++ b/dev-util/pwntools/pwntools-4.10.0_beta0-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Gallopsled/pwntools.git"
else
- SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${PN}-${PV/_beta/beta}"
fi
@@ -49,6 +49,12 @@ PATCHES=(
"${FILESDIR}/${PN}-4.1.0_update_deps.patch"
)
+python_configure_all() {
+ DISTUTILS_ARGS=(
+ --only-use-pwn-command
+ )
+}
+
src_install() {
distutils-r1_src_install
diff --git a/dev-util/pwntools/pwntools-4.9.0-r1.ebuild b/dev-util/pwntools/pwntools-4.9.0-r2.ebuild
index 765bf018a914..716ef0f390c1 100644
--- a/dev-util/pwntools/pwntools-4.9.0-r1.ebuild
+++ b/dev-util/pwntools/pwntools-4.9.0-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Gallopsled/pwntools.git"
else
- SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${PN}-${PV/_beta/beta}"
fi
@@ -49,6 +49,12 @@ PATCHES=(
"${FILESDIR}/${PN}-4.1.0_update_deps.patch"
)
+python_configure_all() {
+ DISTUTILS_ARGS=(
+ --only-use-pwn-command
+ )
+}
+
src_install() {
distutils-r1_src_install
diff --git a/dev-util/pwntools/pwntools-9999.ebuild b/dev-util/pwntools/pwntools-9999.ebuild
index 765bf018a914..716ef0f390c1 100644
--- a/dev-util/pwntools/pwntools-9999.ebuild
+++ b/dev-util/pwntools/pwntools-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Gallopsled/pwntools.git"
else
- SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${PN}-${PV/_beta/beta}"
fi
@@ -49,6 +49,12 @@ PATCHES=(
"${FILESDIR}/${PN}-4.1.0_update_deps.patch"
)
+python_configure_all() {
+ DISTUTILS_ARGS=(
+ --only-use-pwn-command
+ )
+}
+
src_install() {
distutils-r1_src_install