commit: 0e950816d6eadf74d127ec9ad5c44f4da061c77e Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> AuthorDate: Mon Apr 24 21:03:27 2023 +0000 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> CommitDate: Mon Apr 24 21:05:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e950816
net-wireless/aircrack-ng: bump python, qa Fix a few deps per qa scripts Closes: https://bugs.gentoo.org/749789 Closes: https://bugs.gentoo.org/897160 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> .../{aircrack-ng-1.7.ebuild => aircrack-ng-1.7-r1.ebuild} | 13 ++++++++++--- net-wireless/aircrack-ng/aircrack-ng-9999.ebuild | 15 +++++++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.7.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.7-r1.ebuild similarity index 86% rename from net-wireless/aircrack-ng/aircrack-ng-1.7.ebuild rename to net-wireless/aircrack-ng/aircrack-ng-1.7-r1.ebuild index 30d48e8ff2f3..be8363470a9a 100644 --- a/net-wireless/aircrack-ng/aircrack-ng-1.7.ebuild +++ b/net-wireless/aircrack-ng/aircrack-ng-1.7-r1.ebuild @@ -3,7 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9,10} ) +#this doesn't work because of multiple calls to distutils-r1_src_compile +#DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_OPTIONAL=1 inherit toolchain-funcs distutils-r1 flag-o-matic autotools @@ -23,7 +25,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+airdrop-ng +airgraph-ng +netlink +pcre +sqlite +experimental" +IUSE="+airdrop-ng +airgraph-ng +experimental +netlink +pcre +sqlite test" DEPEND="net-libs/libpcap sys-apps/hwloc:0= @@ -34,7 +36,8 @@ DEPEND="net-libs/libpcap airdrop-ng? ( ${PYTHON_DEPS} ) airgraph-ng? ( ${PYTHON_DEPS} ) experimental? ( sys-libs/zlib ) - sqlite? ( >=dev-db/sqlite-3.4 )" + sqlite? ( >=dev-db/sqlite-3.4:3 ) + test? ( dev-tcltk/expect )" RDEPEND="${DEPEND} kernel_linux? ( net-wireless/iw @@ -44,11 +47,14 @@ RDEPEND="${DEPEND} sys-apps/pciutils ) sys-apps/hwdata airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )" +BDEPEND="${DISTUTILS_DEPS}" REQUIRED_USE=" airdrop-ng? ( ${PYTHON_REQUIRED_USE} ) airgraph-ng? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + src_prepare() { default eautoreconf @@ -61,6 +67,7 @@ src_configure() { --enable-shared \ --disable-static \ --without-opt \ + --with-duma=no \ $(use_enable netlink libnl) \ $(use_with experimental) \ $(use_with sqlite sqlite3) diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild index f159d65ad141..b8e12c8d8c8f 100644 --- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild +++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild @@ -3,7 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9,10} ) +#this doesn't work because of multiple calls to distutils-r1_src_compile +#DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_OPTIONAL=1 inherit toolchain-funcs distutils-r1 flag-o-matic autotools @@ -23,18 +25,19 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+airdrop-ng +airgraph-ng +netlink +pcre +sqlite +experimental" +IUSE="+airdrop-ng +airgraph-ng +experimental +netlink +pcre +sqlite test" DEPEND="net-libs/libpcap sys-apps/hwloc:0= dev-libs/libbsd dev-libs/openssl:0= netlink? ( dev-libs/libnl:3 ) - pcre? ( dev-libs/libpcre ) + pcre? ( dev-libs/libpcre2:= ) airdrop-ng? ( ${PYTHON_DEPS} ) airgraph-ng? ( ${PYTHON_DEPS} ) experimental? ( sys-libs/zlib ) - sqlite? ( >=dev-db/sqlite-3.4 )" + sqlite? ( >=dev-db/sqlite-3.4:3 ) + test? ( dev-tcltk/expect )" RDEPEND="${DEPEND} kernel_linux? ( net-wireless/iw @@ -44,11 +47,14 @@ RDEPEND="${DEPEND} sys-apps/pciutils ) sys-apps/hwdata airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )" +BDEPEND="${DISTUTILS_DEPS}" REQUIRED_USE=" airdrop-ng? ( ${PYTHON_REQUIRED_USE} ) airgraph-ng? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + src_prepare() { default eautoreconf @@ -61,6 +67,7 @@ src_configure() { --enable-shared \ --disable-static \ --without-opt \ + --with-duma=no \ $(use_enable netlink libnl) \ $(use_with experimental) \ $(use_with sqlite sqlite3)
