Fix bug#515814, cleanup

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

4 files changed, 7 insertions, 90 deletions

diff --git a/net-wireless/wepdecrypt/ChangeLog b/net-wireless/wepdecrypt/ChangeLog
index cb6e2d0de9b5..c1c926119493 100644
--- a/net-wireless/wepdecrypt/ChangeLog
+++ b/net-wireless/wepdecrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/wepdecrypt
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepdecrypt/ChangeLog,v 1.18 2012/12/21 23:25:01 alonbl Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepdecrypt/ChangeLog,v 1.19 2014/07/01 18:30:55 alonbl Exp $
+
+  01 Jul 2014; Alon Bar-Lev <alonbl@gentoo.org> -wepdecrypt-0.8-r1.ebuild,
+  -wepdecrypt-0.8.ebuild, files/wepdecrypt-0.8-dyn.patch:
+  Fix bug#515814, cleanup
 
 *wepdecrypt-0.8-r2 (21 Dec 2012)
 
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch
index ab3181340759..6fcdc578c729 100644
--- a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch
@@ -7,7 +7,7 @@ index a779cb7..f32e65e 100644
  
  gwepdecrypt: gwepdecrypt.cpp
 -	$(FLTK) --compile gwepdecrypt.cpp
-+	$(CC) $(LDFLAGS) $(CFLAGS) -I. -o $@ gwepdecrypt.cpp $(shell fltk-config --cflags --ldflags) $(LIBS)
++	$(CXX) $(LDFLAGS) $(CFLAGS) -I. -o $@ gwepdecrypt.cpp $(shell fltk-config --cflags --ldflags) $(LIBS)
  
  wkeygen: wkeygen.c
  	$(LD) $(LDFLAGS) $(CFLAGS) -o $@ wkeygen.c $(LIBS)
diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8-r1.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8-r1.ebuild
deleted file mode 100644
index 9d6c4579b962..000000000000
--- a/net-wireless/wepdecrypt/wepdecrypt-0.8-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepdecrypt/wepdecrypt-0.8-r1.ebuild,v 1.3 2011/06/04 06:49:34 jlec Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Enhanced version of WepAttack a tool for breaking 802.11 WEP keys"
-HOMEPAGE="http://wepdecrypt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wepdecrypt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X"
-RDEPEND="
-	dev-libs/openssl
-	net-libs/libpcap
-	sys-libs/zlib
-	X? ( x11-libs/fltk:1 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-fltk.patch
-
-	#Fix buffer size wrt bug 340148.
-	epatch "${FILESDIR}/${P}-buffer.patch"
-
-	#Fix respect for jobserver
-	sed -i 's/make/$(MAKE)/g' Makefile || die "Sed failed"
-}
-
-src_configure() {
-	# build system is broken and --enabled-gui doesn't work
-	local myconf=""
-	! use X && myconf="--disable-gui"
-
-	econf ${myconf}
-}
diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild
deleted file mode 100644
index 0bdf8e3e6971..000000000000
--- a/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 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.10 2011/06/04 06:49:34 jlec Exp $
-
-EAPI=1
-
-inherit eutils
-
-MY_P="${P}"
-
-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"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X"
-RDEPEND="
-	dev-libs/openssl
-	net-libs/libpcap
-	sys-libs/zlib
-	X? ( x11-libs/fltk:1 )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-build.patch"
-}
-
-src_compile() {
-	# build system is broken and --enabled-gui doesn't work
-	if use X; then
-		econf  || die "econf failed"
-	else
-		econf --disable-gui || die "econf failed"
-	fi
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-}