Skip to content

Commit

Permalink
theHarvester: remove workarounds, not really required
Browse files Browse the repository at this point in the history
  • Loading branch information
blshkv committed Jan 6, 2024
1 parent b1c4ff0 commit 9b8bed1
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 120 deletions.
1 change: 0 additions & 1 deletion net-analyzer/theHarvester/Manifest
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
DIST theHarvester-4.4.4.tar.gz 862445 BLAKE2B acf625bc5ab31628c32f27736a485a0fb294329adb90bad77d411edfc786ff80cc70ecc828fb5ddc8ba32b3a2aba9252445e0051cc461ce6b9bd4c7b5ff904b0 SHA512 8e5b115b320c1aa882afcdec011b29ce4b677f1580315499baef200fb05e5cfe9b554eaf443886aa95e0dd26ccff92a4ade5a7d64ffb227833755d7eedd66d71
DIST theHarvester-4.5.0.tar.gz 864382 BLAKE2B 9b8552432a81f82fe2d1c648eb53f382bc549b017a5fd18d3b0e6d36b8f49af93672de2489a118edcebdf4ea40386c87efc5269a739db03d958dbfcdd1959e31 SHA512 4cc13cfaa951587afcd999296f7fa0cd9fdfa65fb2363bb7389df440bde94e64bd2533de0a7e14d302822c2bf3889988d2224a8000278606675f987fb3b4bc3d
87 changes: 0 additions & 87 deletions net-analyzer/theHarvester/theHarvester-4.4.4-r1.ebuild

This file was deleted.

32 changes: 0 additions & 32 deletions net-analyzer/theHarvester/theHarvester-4.5.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@ SRC_URI="https://github.com/laramies/theHarvester/archive/${PV}.tar.gz -> ${P}.t
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
#IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"

# RESTRICT="!test? ( test )"

# requirements/base.txt
RDEPEND="${PYTHON_DEPS}
dev-python/aiodns[${PYTHON_USEDEP}]
Expand Down Expand Up @@ -61,32 +58,3 @@ src_prepare() {
rm -r tests || die
default
}

# hack: https://github.com/laramies/theHarvester/issues/1430
# hack needs to symlink "new" location to old location to avoid violating PMS
# * Package 'net-analyzer/theHarvester-4.3.0' has one or more collisions
# * between symlinks and directories, which is explicitly forbidden by PMS
# * section 13.4 (see bug #326685)
#python_install_all() {
# dodir /etc
# mv "${D}$(python_get_sitedir)/theHarvester/data/" "${ED}/etc/theHarvester/" || die
# rm -r "${D}$(python_get_sitedir)/theHarvester/data" || die
# dosym /etc/theHarvester "$(python_get_sitedir)/theHarvester/data"
# distutils-r1_python_install_all
#}

python_install() {
distutils-r1_python_install
#eapi8-dosym, "-r" option expands <target> path
dosym -r "$(python_get_sitedir)/theHarvester/data" /etc/theHarvester
}

pkg_preinst() {
# Fix the broken hack by keeping /etc/theHarvester as a directory not a symlink
# * Package 'net-analyzer/theHarvester-4.3.0' has one or more collisions
# * between symlinks and directories, which is explicitly forbidden by PMS
# * section 13.4 (see bug #326685)
if [ -L "/etc/theHarvester" ]; then
rm /etc/theHarvester
fi
}

0 comments on commit 9b8bed1

Please sign in to comment.