From 89763dc2dae5b22ba8f41fac814320bf7dd35215 Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Tue, 24 Sep 2013 02:30:50 +0000 Subject: [PATCH] pentoo-wireless: adjust deps for cuda related stuff more appropriately --- pentoo/pentoo-wireless/Manifest | 4 +- .../pentoo-wireless-2012.0-r1.ebuild | 60 ------------------- .../pentoo-wireless-2012.0.ebuild | 56 ----------------- ...build => pentoo-wireless-2013.0-r1.ebuild} | 12 ++-- 4 files changed, 7 insertions(+), 125 deletions(-) delete mode 100644 pentoo/pentoo-wireless/pentoo-wireless-2012.0-r1.ebuild delete mode 100644 pentoo/pentoo-wireless/pentoo-wireless-2012.0.ebuild rename pentoo/pentoo-wireless/{pentoo-wireless-2013.0.ebuild => pentoo-wireless-2013.0-r1.ebuild} (92%) diff --git a/pentoo/pentoo-wireless/Manifest b/pentoo/pentoo-wireless/Manifest index 82d3cc351..b51fd56c9 100644 --- a/pentoo/pentoo-wireless/Manifest +++ b/pentoo/pentoo-wireless/Manifest @@ -1,3 +1 @@ -EBUILD pentoo-wireless-2012.0-r1.ebuild 1559 SHA256 edb6ce3a8713d14c24d76271a4ce42d0ff355b45ce53547eb83db1b1e5e87f54 SHA512 b3c96b6bd6266715b031516142824b1dabc1ac093f9990579cb203688e760f417b4bb2c33be15bf86c3a0cbec42bc4c1e79984f32ed2e16dae11688626f468ee WHIRLPOOL cf6616adb6410022b85ffcbc1b332b72338dc41596e158c0185d84d8156973fd7afd17f3198d6dede45f397af17b4f70e831fae29e57147f5d36f199c767ad61 -EBUILD pentoo-wireless-2012.0.ebuild 1477 SHA256 13ec1651e045c6d43369f120dd076f4cceedeebd98e0c21db4f69bf9adc8ffe8 SHA512 15047399edc6233fb9bd53de8bf93f2ace17d43ef64af4a76c710ee46e59aa9d10d3efcd7540fe397deeabde5c49b55e23ad227e8652dd4736ec0099aae201f8 WHIRLPOOL 7bf2dbf9144aa59d4586e3e6b894c5f7e1a3ca8777e4127514cb4695e12a8595aa051ede9d513b019f80dc976d59f4a30ccbe44fe4943ebca94ad952c27c78cd -EBUILD pentoo-wireless-2013.0.ebuild 1574 SHA256 708d8dcd0091de0de4043d43454864b78df1ad49c717eb158a7d4804195d4b39 SHA512 85eb4f3b19ae42fc38a84ac4d5c0d99a847db33da39c05153f3357fe0fa785d0085b02ac819c6d2b4cb211a676e8cbd56695a2c444e7e47e4ba164ba1e8f563a WHIRLPOOL bca7ca76be49ceb5c4009038a14df330a426b6e9fe6f324641440423f0617c028cb936b615382b3431d09c582a9367ee5694efe752472f3a91e89710b619f2a5 +EBUILD pentoo-wireless-2013.0-r1.ebuild 1570 SHA256 adcb11c48f3397bf10fb495e7bdd4afa83b3ca0f7a956d9d3b9c64e378bab4da SHA512 2e118032883664dfe0a25244eade08b2f452d2be8bb54a7163690db564877a7fd6554d539b2c80c20531139a1f48089e6d8a301ffafbb4f8bc5aff7643803f68 WHIRLPOOL 7c3e9afa17437b1843736d365a8a34cc9752d9539d4855dba1343791f068b39b426cbf6b3345d376a576542779a056042ad832d0bd9e2eb313634387686247cc diff --git a/pentoo/pentoo-wireless/pentoo-wireless-2012.0-r1.ebuild b/pentoo/pentoo-wireless/pentoo-wireless-2012.0-r1.ebuild deleted file mode 100644 index 18228a7e4..000000000 --- a/pentoo/pentoo-wireless/pentoo-wireless-2012.0-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -KEYWORDS="-*" -DESCRIPTION="Pentoo wireless meta ebuild" -HOMEPAGE="http://www.pentoo.ch" -SLOT="0" -LICENSE="GPL-2" -IUSE="+b43 gps drivers livecd-stage1" - -DEPEND="" - -RDEPEND="${DEPEND} - !livecd-stage1? ( app-crypt/pyrit - net-wireless/wifite - net-wireless/fern-wifi-cracker - drivers? ( - || ( - net-wireless/compat-wireless - net-wireless/compat-wireless-builder - sys-kernel/compat-drivers ) - b43? ( net-wireless/b43-openfwwf - net-wireless/broadcom-firmware-downloader ) - net-wireless/orinoco-fwutils - ) - ) - gps? ( sci-geosciences/gpsd ) - app-crypt/asleap - net-dialup/freeradius[wpe] - net-wireless/aircrack-ng - net-wireless/airsnort - net-wireless/karmetasploit - net-wireless/kismet - net-wireless/mdk - net-wireless/reaver - net-wireless/rfkill - net-wireless/spectools - net-wireless/wepattack - net-wireless/wifi-radar - net-wireless/wireless-tools - net-wireless/wpa_supplicant - net-wireless/cowpatty - net-wireless/crda - net-wireless/iw - || ( net-wireless/hostapd[karma] net-wireless/hostapd[karma_cli] )" - #net-misc/karma - #net-wireless/haraldscan - #net-wireless/wifiscanner - #x86? ( net-wireless/intel-wimax-network-service ) - #net-wireless/gerix - #net-wireless/wifitap - #net-wireless/airpwn - #net-wireless/airoscript - #net-wireless/wepdecrypt - -pkg_postinst() { - use !drivers && ewarn "Disabling drivers for pentoo-wireless may make injection impossible and may provide support for fewer wifi cards with more bugs" -} diff --git a/pentoo/pentoo-wireless/pentoo-wireless-2012.0.ebuild b/pentoo/pentoo-wireless/pentoo-wireless-2012.0.ebuild deleted file mode 100644 index a505e0ed9..000000000 --- a/pentoo/pentoo-wireless/pentoo-wireless-2012.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -KEYWORDS="-*" -DESCRIPTION="Pentoo wireless meta ebuild" -HOMEPAGE="http://www.pentoo.ch" -SLOT="0" -LICENSE="GPL" -IUSE="+b43 gps drivers livecd-stage1" - -DEPEND="" - -RDEPEND="${DEPEND} - !livecd-stage1? ( app-crypt/pyrit - net-wireless/wifite - net-wireless/fern-wifi-cracker - drivers? ( || ( net-wireless/compat-wireless net-wireless/compat-wireless-builder ) - b43? ( net-wireless/b43-openfwwf - net-wireless/broadcom-firmware-downloader ) - net-wireless/orinoco-fwutils - ) - ) - gps? ( sci-geosciences/gpsd ) - app-crypt/asleap - net-dialup/freeradius[wpe] - net-wireless/aircrack-ng - net-wireless/airsnort - net-wireless/karmetasploit - net-wireless/kismet - net-wireless/mdk - net-wireless/reaver - net-wireless/rfkill - net-wireless/spectools - net-wireless/wepattack - net-wireless/wifi-radar - net-wireless/wireless-tools - net-wireless/wpa_supplicant - net-wireless/cowpatty - net-wireless/crda - net-wireless/iw - net-wireless/hostapd[karma]" - #net-misc/karma - #net-wireless/haraldscan - #net-wireless/wifiscanner - #x86? ( net-wireless/intel-wimax-network-service ) - #net-wireless/gerix - #net-wireless/wifitap - #net-wireless/airpwn - #net-wireless/airoscript - #net-wireless/wepdecrypt - -pkg_postinst() { - use !drivers && ewarn "Disabling drivers for pentoo-wireless may make injection impossible and may provide support for fewer wifi cards with more bugs" -} diff --git a/pentoo/pentoo-wireless/pentoo-wireless-2013.0.ebuild b/pentoo/pentoo-wireless/pentoo-wireless-2013.0-r1.ebuild similarity index 92% rename from pentoo/pentoo-wireless/pentoo-wireless-2013.0.ebuild rename to pentoo/pentoo-wireless/pentoo-wireless-2013.0-r1.ebuild index 53ac21682..9ab1c4e48 100644 --- a/pentoo/pentoo-wireless/pentoo-wireless-2013.0.ebuild +++ b/pentoo/pentoo-wireless/pentoo-wireless-2013.0-r1.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI="5" -KEYWORDS="5" +KEYWORDS="" DESCRIPTION="Pentoo wireless meta ebuild" HOMEPAGE="http://www.pentoo.ch" SLOT="0" @@ -13,9 +13,7 @@ IUSE="+b43 cuda gps drivers livecd-stage1" DEPEND="" RDEPEND="${DEPEND} - !livecd-stage1? ( cuda? ( app-crypt/pyrit - net-wireless/wifite ) - net-wireless/fern-wifi-cracker + !livecd-stage1? ( cuda? ( app-crypt/pyrit ) drivers? ( || ( net-wireless/compat-wireless @@ -31,6 +29,9 @@ RDEPEND="${DEPEND} net-dialup/freeradius[wpe] net-wireless/aircrack-ng net-wireless/airsnort + net-wireless/cowpatty + net-wireless/crda + net-wireless/fern-wifi-cracker net-wireless/karmetasploit net-wireless/kismet net-wireless/mdk @@ -38,11 +39,10 @@ RDEPEND="${DEPEND} net-wireless/rfkill net-wireless/spectools net-wireless/wepattack + net-wireless/wifite net-wireless/wifi-radar net-wireless/wireless-tools net-wireless/wpa_supplicant - net-wireless/cowpatty - net-wireless/crda net-wireless/iw || ( net-wireless/hostapd[karma] net-wireless/hostapd[karma_cli] )" #net-misc/karma