gentoo resync : 25.08.2018

1 files changed, 16 insertions, 30 deletions

diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index 1d10edd8197a..82a54cb816c4 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -17,18 +17,18 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	MY_PV=${PV/_/-}
-	SRC_URI="http://download.${PN}.org/${PN}-${MY_PV}.tar.gz"
+	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"
 SLOT="0"
 
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental"
 
 DEPEND="net-libs/libpcap
-	dev-libs/openssl:0=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	netlink? ( dev-libs/libnl:3 )
 	pcre? ( dev-libs/libpcre )
 	airdrop-ng? ( ${PYTHON_DEPS} )
@@ -45,34 +45,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 +72,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 +84,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 +96,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
 }