commit: ed0fc75c1e00358c0c1ef645973609ffba13d5b5
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 01:24:27 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 01:36:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed0fc75c
net-wireless/aircrack-ng: minor qa
Pointed out by Arfrever right after my commit.
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
...-ng-1.7-r1.ebuild => aircrack-ng-1.7-r2.ebuild} | 25 ++++++++++++----------
net-wireless/aircrack-ng/aircrack-ng-9999.ebuild | 25 ++++++++++++----------
2 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.7-r1.ebuild
b/net-wireless/aircrack-ng/aircrack-ng-1.7-r2.ebuild
similarity index 83%
rename from net-wireless/aircrack-ng/aircrack-ng-1.7-r1.ebuild
rename to net-wireless/aircrack-ng/aircrack-ng-1.7-r2.ebuild
index be8363470a9a..a4fe5c4ec493 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.7-r1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.7-r2.ebuild
@@ -27,7 +27,7 @@ SLOT="0"
IUSE="+airdrop-ng +airgraph-ng +experimental +netlink +pcre +sqlite test"
-DEPEND="net-libs/libpcap
+CDEPEND="net-libs/libpcap
sys-apps/hwloc:0=
dev-libs/libbsd
dev-libs/openssl:0=
@@ -37,8 +37,11 @@ DEPEND="net-libs/libpcap
airgraph-ng? ( ${PYTHON_DEPS} )
experimental? ( sys-libs/zlib )
sqlite? ( >=dev-db/sqlite-3.4:3 )
- test? ( dev-tcltk/expect )"
-RDEPEND="${DEPEND}
+ "
+DEPEND="${CDEPEND}
+ test? ( dev-tcltk/expect )
+ "
+RDEPEND="${CDEPEND}
kernel_linux? (
net-wireless/iw
net-wireless/wireless-tools
@@ -47,10 +50,10 @@ RDEPEND="${DEPEND}
sys-apps/pciutils )
sys-apps/hwdata
airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-BDEPEND="${DISTUTILS_DEPS}"
+#BDEPEND="airdrop-ng? ( ${DISTUTILS_DEPS} )
+# airgraph-ng? ( ${DISTUTILS_DEPS} )"
-REQUIRED_USE="
- airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
@@ -82,11 +85,11 @@ src_compile() {
default
if use airgraph-ng; then
- cd "${S}/scripts/airgraph-ng"
+ cd "${S}/scripts/airgraph-ng" || die
distutils-r1_src_compile
fi
if use airdrop-ng; then
- cd "${S}/scripts/airdrop-ng"
+ cd "${S}/scripts/airdrop-ng" || die
distutils-r1_src_compile
fi
}
@@ -95,15 +98,15 @@ src_install() {
default
if use airgraph-ng; then
- cd "${S}/scripts/airgraph-ng"
+ cd "${S}/scripts/airgraph-ng" || die
distutils-r1_src_install
fi
if use airdrop-ng; then
- cd "${S}/scripts/airdrop-ng"
+ cd "${S}/scripts/airdrop-ng" || die
distutils-r1_src_install
fi
# we don't need aircrack-ng's oui updater, we have our own
- rm "${ED}"/usr/sbin/airodump-ng-oui-update
+ rm "${ED}"/usr/sbin/airodump-ng-oui-update || die
find "${D}" -xtype f -name '*.la' -delete || die
}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index b8e12c8d8c8f..41428d7587ed 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -27,7 +27,7 @@ SLOT="0"
IUSE="+airdrop-ng +airgraph-ng +experimental +netlink +pcre +sqlite test"
-DEPEND="net-libs/libpcap
+CDEPEND="net-libs/libpcap
sys-apps/hwloc:0=
dev-libs/libbsd
dev-libs/openssl:0=
@@ -37,8 +37,11 @@ DEPEND="net-libs/libpcap
airgraph-ng? ( ${PYTHON_DEPS} )
experimental? ( sys-libs/zlib )
sqlite? ( >=dev-db/sqlite-3.4:3 )
- test? ( dev-tcltk/expect )"
-RDEPEND="${DEPEND}
+ "
+DEPEND="${CDEPEND}
+ test? ( dev-tcltk/expect )
+ "
+RDEPEND="${CDEPEND}
kernel_linux? (
net-wireless/iw
net-wireless/wireless-tools
@@ -47,10 +50,10 @@ RDEPEND="${DEPEND}
sys-apps/pciutils )
sys-apps/hwdata
airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-BDEPEND="${DISTUTILS_DEPS}"
+#BDEPEND="airdrop-ng? ( ${DISTUTILS_DEPS} )
+# airgraph-ng? ( ${DISTUTILS_DEPS} )"
-REQUIRED_USE="
- airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
@@ -82,11 +85,11 @@ src_compile() {
default
if use airgraph-ng; then
- cd "${S}/scripts/airgraph-ng"
+ cd "${S}/scripts/airgraph-ng" || die
distutils-r1_src_compile
fi
if use airdrop-ng; then
- cd "${S}/scripts/airdrop-ng"
+ cd "${S}/scripts/airdrop-ng" || die
distutils-r1_src_compile
fi
}
@@ -95,15 +98,15 @@ src_install() {
default
if use airgraph-ng; then
- cd "${S}/scripts/airgraph-ng"
+ cd "${S}/scripts/airgraph-ng" || die
distutils-r1_src_install
fi
if use airdrop-ng; then
- cd "${S}/scripts/airdrop-ng"
+ cd "${S}/scripts/airdrop-ng" || die
distutils-r1_src_install
fi
# we don't need aircrack-ng's oui updater, we have our own
- rm "${ED}"/usr/sbin/airodump-ng-oui-update
+ rm "${ED}"/usr/sbin/airodump-ng-oui-update || die
find "${D}" -xtype f -name '*.la' -delete || die
}
