From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 159B9138335 for ; Tue, 14 Aug 2018 11:31:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE92DE08C2; Tue, 14 Aug 2018 11:31:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B8C1E08C0 for ; Tue, 14 Aug 2018 11:31:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E64FE335CCF for ; Tue, 14 Aug 2018 11:31:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17AA23A7 for ; Tue, 14 Aug 2018 11:31:12 +0000 (UTC) From: "Alon Bar-Lev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alon Bar-Lev" Message-ID: <1534246259.47e78a0cdc644b606e93b72dbff367738dcdc7c3.alonbl@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/aircrack-ng/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/aircrack-ng/aircrack-ng-1.3-r2.ebuild net-wireless/aircrack-ng/aircrack-ng-9999.ebuild X-VCS-Directories: net-wireless/aircrack-ng/ X-VCS-Committer: alonbl X-VCS-Committer-Name: Alon Bar-Lev X-VCS-Revision: 47e78a0cdc644b606e93b72dbff367738dcdc7c3 X-VCS-Branch: master Date: Tue, 14 Aug 2018 11:31:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b5eb4be6-cb36-402d-956d-5d0bef9bf61a X-Archives-Hash: ff5f5a18f70c3f6d5e35bbe9d22f2693 commit: 47e78a0cdc644b606e93b72dbff367738dcdc7c3 Author: Alon Bar-Lev gentoo org> AuthorDate: Tue Aug 14 11:06:48 2018 +0000 Commit: Alon Bar-Lev gentoo org> CommitDate: Tue Aug 14 11:30:59 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e78a0c net-wireless/aircrack-ng: ebuild cleanups Package-Manager: Portage-2.3.40, Repoman-2.3.9 net-wireless/aircrack-ng/aircrack-ng-1.3-r2.ebuild | 44 ++++++++-------------- net-wireless/aircrack-ng/aircrack-ng-9999.ebuild | 39 ++++++------------- 2 files changed, 28 insertions(+), 55 deletions(-) diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.3-r2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.3-r2.ebuild index 750e234f898..932cae27508 100644 --- a/net-wireless/aircrack-ng/aircrack-ng-1.3-r2.ebuild +++ b/net-wireless/aircrack-ng/aircrack-ng-1.3-r2.ebuild @@ -19,7 +19,6 @@ else MY_PV=${PV/_/-} SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" - S="${WORKDIR}/${PN}-${MY_PV}" fi LICENSE="GPL-2" @@ -45,35 +44,29 @@ PDEPEND="kernel_linux? ( sys-apps/hwids airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )" -REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} ) - airgraph-ng? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - MAKE_COMMON=( - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - LD="$(tc-getLD)" \ - RANLIB="$(tc-getRANLIB)" \ - DESTDIR="${ED}" - ) -} +REQUIRED_USE=" + airdrop-ng? ( ${PYTHON_REQUIRED_USE} ) + airgraph-ng? ( ${PYTHON_REQUIRED_USE} ) +" + +PATCHES=( + "${FILESDIR}/${P}-8812au.patch" +) src_prepare() { - eapply "${FILESDIR}/${P}-8812au.patch" - eapply_user + default eautoreconf } src_configure() { econf \ --disable-asan \ - $(use_enable netlink libnl) \ - $(use_with experimental) \ - $(use_with sqlite sqlite3) \ --enable-shared \ --disable-static \ - --without-opt + --without-opt \ + $(use_enable netlink libnl) \ + $(use_with experimental) \ + $(use_with sqlite sqlite3) } src_compile() { @@ -82,7 +75,7 @@ src_compile() { filter-flags -frecord-gcc-switches fi - emake "${MAKE_COMMON[@]}" + default if use airgraph-ng; then cd "${S}/scripts/airgraph-ng" @@ -94,13 +87,8 @@ src_compile() { fi } -src_test() { - emake "${MAKE_COMMON[@]}" check -} - src_install() { - einstalldocs - emake "${MAKE_COMMON[@]}" install + default if use airgraph-ng; then cd "${S}/scripts/airgraph-ng" @@ -111,7 +99,7 @@ src_install() { distutils-r1_src_install fi - #we don't need aircrack-ng's oui updater, we have our own + # we don't need aircrack-ng's oui updater, we have our own rm "${ED}"/usr/sbin/airodump-ng-oui-update } diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild index ce0358979ab..5921374bbc9 100644 --- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild +++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild @@ -19,7 +19,6 @@ else MY_PV=${PV/_/-} SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" - S="${WORKDIR}/${PN}-${MY_PV}" fi LICENSE="GPL-2" @@ -45,34 +44,25 @@ PDEPEND="kernel_linux? ( sys-apps/hwids airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )" -REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} ) - airgraph-ng? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - MAKE_COMMON=( - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - LD="$(tc-getLD)" \ - RANLIB="$(tc-getRANLIB)" \ - DESTDIR="${ED}" - ) -} +REQUIRED_USE=" + airdrop-ng? ( ${PYTHON_REQUIRED_USE} ) + airgraph-ng? ( ${PYTHON_REQUIRED_USE} ) +" src_prepare() { - eapply_user + default eautoreconf } src_configure() { econf \ --disable-asan \ - $(use_enable netlink libnl) \ - $(use_with experimental) \ - $(use_with sqlite sqlite3) \ --enable-shared \ --disable-static \ - --without-opt + --without-opt \ + $(use_enable netlink libnl) \ + $(use_with experimental) \ + $(use_with sqlite sqlite3) } src_compile() { @@ -81,7 +71,7 @@ src_compile() { filter-flags -frecord-gcc-switches fi - emake "${MAKE_COMMON[@]}" + default if use airgraph-ng; then cd "${S}/scripts/airgraph-ng" @@ -93,13 +83,8 @@ src_compile() { fi } -src_test() { - emake "${MAKE_COMMON[@]}" check -} - src_install() { - einstalldocs - emake "${MAKE_COMMON[@]}" install + default if use airgraph-ng; then cd "${S}/scripts/airgraph-ng" @@ -110,7 +95,7 @@ src_install() { distutils-r1_src_install fi - #we don't need aircrack-ng's oui updater, we have our own + # we don't need aircrack-ng's oui updater, we have our own rm "${ED}"/usr/sbin/airodump-ng-oui-update }