Version bump (bug #279609).

(Portage version: 13854-svn/cvs/Linux x86_64)

4 files changed, 16 insertions, 88 deletions

diff --git a/net-wireless/aircrack-ng/ChangeLog b/net-wireless/aircrack-ng/ChangeLog
index 8d42a37c7a96..9c9f920c7dd1 100644
--- a/net-wireless/aircrack-ng/ChangeLog
+++ b/net-wireless/aircrack-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/aircrack-ng
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.46 2009/06/01 16:15:53 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.47 2009/07/29 18:28:21 arfrever Exp $
+
+*aircrack-ng-1.0_rc4 (29 Jul 2009)
+
+  29 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -aircrack-ng-1.0_rc1.ebuild, -aircrack-ng-1.0_rc2-r1.ebuild,
+  +aircrack-ng-1.0_rc4.ebuild, -files/sha-compile-fix-64bit.patch:
+  Version bump (bug #279609).
 
   01 Jun 2009; nixnut <nixnut@gentoo.org> aircrack-ng-1.0_rc3.ebuild:
   ppc stable #268024
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.0_rc1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.0_rc1.ebuild
deleted file mode 100644
index 8a8585ee3b9e..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.0_rc1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.0_rc1.ebuild,v 1.1 2009/01/05 05:27:49 rbu Exp $
-
-EAPI=1
-inherit versionator toolchain-funcs
-
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
-HOMEPAGE="http://www.aircrack-ng.org"
-SRC_URI="http://download.aircrack-ng.org/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite"
-
-DEPEND="dev-libs/openssl
-	sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}
-	net-wireless/iw"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-have_sqlite() {
-	use sqlite && echo "true" || echo "false"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" sqlite=$(have_sqlite) || die "emake failed"
-}
-
-src_install() {
-	emake \
-		prefix="/usr" \
-		mandir="/usr/share/man/man1" \
-		DESTDIR="${D}" \
-		sqlite=$(have_sqlite) \
-		install \
-		|| die "emake install failed"
-
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.0_rc2-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.0_rc4.ebuild
index 1597419761e0..93b6e2242e28 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.0_rc2-r1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.0_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.0_rc2-r1.ebuild,v 1.3 2009/03/19 17:14:23 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.0_rc4.ebuild,v 1.1 2009/07/29 18:28:21 arfrever Exp $
 
 EAPI=2
 inherit versionator eutils toolchain-funcs
@@ -28,24 +28,28 @@ have_sqlite() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/sha-compile-fix-64bit.patch"
 	if use kernel_FreeBSD ; then
-		epatch "${FILESDIR}/${P}-freebsd.patch"
+		epatch "${FILESDIR}/${PN}-1.0_rc2-freebsd.patch"
 		sed -i -e "s:^\(SCRIPTS.*\)airmon-ng:\1:g" Makefile
 		sed -i -e "s:airmon-ng.1::g" manpages/Makefile
 	fi
+
+	epatch "${FILESDIR}/${PN}-1.0_rc3-respect_LDFLAGS.patch"
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" sqlite=$(have_sqlite) || die "emake failed"
+	# UNSTABLE=true enables building of buddy-ng, easside-ng, tkiptun-ng and wesside-ng
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" sqlite=$(have_sqlite) UNSTABLE=true || die "emake failed"
 }
 
 src_install() {
+	# UNSTABLE=true enables installation of buddy-ng, easside-ng, tkiptun-ng and wesside-ng
 	emake \
 		prefix="/usr" \
 		mandir="/usr/share/man/man1" \
 		DESTDIR="${D}" \
 		sqlite=$(have_sqlite) \
+		UNSTABLE=true \
 		install \
 		|| die "emake install failed"
 
diff --git a/net-wireless/aircrack-ng/files/sha-compile-fix-64bit.patch b/net-wireless/aircrack-ng/files/sha-compile-fix-64bit.patch
deleted file mode 100644
index e47d718acfa0..000000000000
--- a/net-wireless/aircrack-ng/files/sha-compile-fix-64bit.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: src/sha1-sse2.S
-===================================================================
---- src/sha1-sse2.S	(revision 1365)
-+++ src/sha1-sse2.S	(working copy)
-@@ -413,11 +413,16 @@
- 		ret
- do_cpuid:
- #endif   	
--		
-+
-+#ifdef __x86_64__
-+		push    %rbx
-+		push    %rcx
-+		push    %rdx
-+#else
- 		push	%ebx
- 		push	%ecx
- 		push	%edx
--		
-+#endif		
-    		movl	$1, %eax
-    		cpuid
-    		
-@@ -438,9 +443,15 @@
- 		movl	$0, %eax
- 
- cpuid_exit:
-+#ifdef __x86_64__
-+		pop		%rdx
-+		pop		%rcx
-+		pop		%rbx
-+#else
- 		pop		%edx
- 		pop		%ecx
- 		pop		%ebx
-+#endif
- 		ret
- #endif
-