Cleanup

(Portage version: 2.1.3.19)

7 files changed, 33 insertions, 97 deletions

diff --git a/net-wireless/wepdecrypt/ChangeLog b/net-wireless/wepdecrypt/ChangeLog
index 03a0c8730204..380eeda2163a 100644
--- a/net-wireless/wepdecrypt/ChangeLog
+++ b/net-wireless/wepdecrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/wepdecrypt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepdecrypt/ChangeLog,v 1.10 2007/07/23 11:02:48 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepdecrypt/ChangeLog,v 1.11 2007/11/10 16:59:21 alonbl Exp $
+
+  10 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/wepdecrypt-0.7-makefile.patch,
+  -files/wepdecrypt-0.8-as-needed.patch, +files/wepdecrypt-0.8-build.patch,
+  -wepdecrypt-0.7.ebuild, wepdecrypt-0.8.ebuild:
+  Cleanup
 
   23 Jul 2007; Mike Auty <ikelos@gentoo.org>
   +files/wepdecrypt-0.8-as-needed.patch, wepdecrypt-0.8.ebuild:
diff --git a/net-wireless/wepdecrypt/files/digest-wepdecrypt-0.7 b/net-wireless/wepdecrypt/files/digest-wepdecrypt-0.7
deleted file mode 100644
index 7e394629434d..000000000000
--- a/net-wireless/wepdecrypt/files/digest-wepdecrypt-0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 72576cec9af9486bf64124b7aaa79f31 WepDecrypt-0.7.tar.gz 82832
-RMD160 5ebf8838aefc18c0aa61430efd4e59ab243f3055 WepDecrypt-0.7.tar.gz 82832
-SHA256 29ae072985616a0141a07e767e667cd33c917605338d37824de96c765a692333 WepDecrypt-0.7.tar.gz 82832
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.7-makefile.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.7-makefile.patch
deleted file mode 100644
index 8e7dc95edd13..000000000000
--- a/net-wireless/wepdecrypt/files/wepdecrypt-0.7-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wepdecrypt-0.7/src/Makefile.orig	2006-05-25 23:27:29.000000000 +1000
-+++ wepdecrypt-0.7/src/Makefile	2006-05-25 23:27:38.000000000 +1000
-@@ -4,7 +4,7 @@
- 
- 
- wepdecrypt: 	wepdecrypt.o rc4.o wepfilter.o log.o modes.o misc.o verify.o keygen.o localkeygen.o wepserver.o wepclient.o md5_digest.o
--	$(LD) $(LDFLAGS) -o $@ wepdecrypt.o rc4.o wepfilter.o log.o\
-+	$(LD) $(LDFLAGS) -o $@ wepdecrypt.o rc4.o wepfilter.o log.o \
- 	modes.o misc.o md5_digest.o  wepserver.o wepclient.o verify.o keygen.o localkeygen.o $(LIBS)
- 	strip wepdecrypt
- 
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-as-needed.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-as-needed.patch
deleted file mode 100644
index ea6a574b2683..000000000000
--- a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr wepdecrypt-0.8.orig/src/Makefile wepdecrypt-0.8/src/Makefile
---- wepdecrypt-0.8.orig/src/Makefile	2007-07-23 08:34:27.000000000 +0100
-+++ wepdecrypt-0.8/src/Makefile	2007-07-23 08:34:46.000000000 +0100
-@@ -13,7 +13,7 @@
- 	@if [ -f gwepdecrypt.exe ]; then		strip.exe gwepdecrypt.exe; echo "strip.exe gwepdecrypt.exe"; 	else		strip gwepdecrypt; echo "strip gwepdecrypt"; fi	
- 
- wkeygen: wkeygen.c
--	$(LD) $(LDFLAGS) $(CFLAGS) $(LIBS) -o $@ wkeygen.c
-+	$(LD) $(LDFLAGS) $(CFLAGS) -o $@ wkeygen.c $(LIBS)
- 	@if [ -f wkeygen.exe ]; then		strip wkeygen.exe; echo "strip wkeygen.exe"; 	else		strip wkeygen; echo "strip wkeygen"; fi
- 	
- wepdecrypt.o:	wepdecrypt.c wepdecrypt.h
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-build.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-build.patch
new file mode 100644
index 000000000000..5c13f87a7402
--- /dev/null
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-build.patch
@@ -0,0 +1,20 @@
+diff -urNp wepdecrypt-0.8.org/src/Makefile wepdecrypt-0.8/src/Makefile
+--- wepdecrypt-0.8.org/src/Makefile	2006-07-09 02:48:08.000000000 +0300
++++ wepdecrypt-0.8/src/Makefile	2007-11-10 18:36:25.000000000 +0200
+@@ -6,15 +6,12 @@ include ../config.mak
+ wepdecrypt: 	wepdecrypt.o rc4.o wepfilter.o log.o modes.o misc.o verify.o keygen.o localkeygen.o wepserver.o wepclient.o md5_digest.o
+ 	$(LD) $(LDFLAGS) -o $@ wepdecrypt.o rc4.o wepfilter.o log.o \
+ 	modes.o misc.o md5_digest.o  wepserver.o wepclient.o verify.o keygen.o localkeygen.o $(LIBS)
+-	@if [ -f wepdecrypt.exe ]; then		strip.exe wepdecrypt.exe; echo "strip.exe wepdecrypt.exe"; 	else		strip wepdecrypt; echo "strip wepdecrypt"; fi
+ 
+ gwepdecrypt: gwepdecrypt.cpp
+ 	$(FLTK) --compile gwepdecrypt.cpp
+-	@if [ -f gwepdecrypt.exe ]; then		strip.exe gwepdecrypt.exe; echo "strip.exe gwepdecrypt.exe"; 	else		strip gwepdecrypt; echo "strip gwepdecrypt"; fi	
+ 
+ wkeygen: wkeygen.c
+-	$(LD) $(LDFLAGS) $(CFLAGS) $(LIBS) -o $@ wkeygen.c
+-	@if [ -f wkeygen.exe ]; then		strip wkeygen.exe; echo "strip wkeygen.exe"; 	else		strip wkeygen; echo "strip wkeygen"; fi
++	$(LD) $(LDFLAGS) $(CFLAGS) -o $@ wkeygen.c $(LIBS)
+ 	
+ wepdecrypt.o:	wepdecrypt.c wepdecrypt.h
+ 	$(CC) $(CFLAGS) -c -o $@ wepdecrypt.c
diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.7.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.7.ebuild
deleted file mode 100644
index 911aebd612da..000000000000
--- a/net-wireless/wepdecrypt/wepdecrypt-0.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepdecrypt/wepdecrypt-0.7.ebuild,v 1.6 2007/07/23 11:02:48 ikelos Exp $
-
-inherit eutils
-
-MY_P="WepDecrypt-${PV}"
-DESCRIPTION="Enhanced version of WepAttack a tool for breaking 802.11 WEP keys"
-HOMEPAGE="http://wepdecrypt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wepdecrypt/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#Please don't add ppc as wepdecrypt doesn't work under ppc
-KEYWORDS="~ppc ~x86"
-IUSE="X"
-
-RDEPEND="X? ( >=x11-libs/fltk-1.1.6 )
-	sys-libs/zlib
-	net-libs/libpcap
-	dev-libs/openssl"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-makefile.patch
-}
-
-src_compile() {
-	local conf
-	if ! use X
-	then
-		conf=--disable-gui
-	fi
-	econf ${conf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin src/wepdecrypt run/wepdecrypt_{inc,word} || die
-
-	if use X; then
-		dobin src/gwepdecrypt || die
-	fi
-
-	insinto /etc
-	doins conf/wepdecrypt.conf
-	doman doc/wepdecrypt.1.gz
-	dodoc CHANGELOG README doc/manual.html doc/manual.txt
-}
diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild
index ab0e8f33671d..7f2b7f9195aa 100644
--- a/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild
+++ b/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild,v 1.4 2007/07/23 11:02:48 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild,v 1.5 2007/11/10 16:59:21 alonbl Exp $
 
 inherit eutils
 
@@ -23,29 +23,16 @@ DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-as-needed.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-build.patch"
 }
 
 src_compile() {
-	local conf
-	if ! use X
-	then
-		conf=--disable-gui
-	fi
-	econf ${conf} || die "econf failed"
+	econf $(use_enable X gui) || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	dobin src/wepdecrypt run/wepdecrypt_{inc,word} src/wkeygen || die
-
-	if use X; then
-		dobin src/gwepdecrypt || die
-	fi
-
-	insinto /etc
-	doins conf/wepdecrypt.conf
-	doman doc/wepdecrypt.1 doc/wkeygen.1
-	dodoc CHANGELOG README TODO doc/manual.html doc/manual.txt doc/Examples.txt
+	emake install DESTDIR="${D}"
 }
+