Fix detection of fltk:1, #359645

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

4 files changed, 35 insertions, 15 deletions

diff --git a/net-wireless/wepdecrypt/ChangeLog b/net-wireless/wepdecrypt/ChangeLog
index 83c5b2d67fc8..eddca34b314c 100644
--- a/net-wireless/wepdecrypt/ChangeLog
+++ b/net-wireless/wepdecrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/wepdecrypt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepdecrypt/ChangeLog,v 1.15 2011/03/20 20:02:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wepdecrypt/ChangeLog,v 1.16 2011/06/04 06:49:34 jlec Exp $
+
+  04 Jun 2011; Justin Lecher <jlec@gentoo.org> wepdecrypt-0.8.ebuild,
+  wepdecrypt-0.8-r1.ebuild, +files/wepdecrypt-0.8-fltk.patch:
+  Fix detection of fltk:1, #359645
 
   20 Mar 2011; Justin Lecher <jlec@gentoo.org> wepdecrypt-0.8.ebuild,
   wepdecrypt-0.8-r1.ebuild:
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fltk.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fltk.patch
new file mode 100644
index 000000000000..149c3eae32ad
--- /dev/null
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fltk.patch
@@ -0,0 +1,16 @@
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 12fa395..258b157 100755
+--- a/configure
++++ b/configure
+@@ -2915,7 +2915,7 @@ fi
+ 		FIELD2=`$FLTK_CONFIG --version | awk -F . '{print $2}'`;
+ 		FIELD3=`$FLTK_CONFIG --version | awk -F . '{print $3}'`;
+ 
+-		if test $FIELD1 -le 1 -a $FIELD3 -lt 6; then
++		if test $FIELD1 -le 1 -a $FIELD2 -lt 1; then
+ 			echo -e "\nconfigure: error: fltk-version must be 1.1.6 or greater!\n"; exit -1;
+ 		fi
+ 		if test $FIELD1 -lt 1; then
diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8-r1.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8-r1.ebuild
index 723c8c08d953..9d6c4579b962 100644
--- a/net-wireless/wepdecrypt/wepdecrypt-0.8-r1.ebuild
+++ b/net-wireless/wepdecrypt/wepdecrypt-0.8-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2011/03/20 20:02:37 jlec Exp $
+# $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="2"
+EAPI=4
 
 inherit eutils
 
@@ -14,14 +14,17 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X"
-RDEPEND="dev-libs/openssl
+RDEPEND="
+	dev-libs/openssl
 	net-libs/libpcap
 	sys-libs/zlib
 	X? ( x11-libs/fltk:1 )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-fltk.patch
 
 	#Fix buffer size wrt bug 340148.
 	epatch "${FILESDIR}/${P}-buffer.patch"
@@ -37,7 +40,3 @@ src_configure() {
 
 	econf ${myconf}
 }
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-}
diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild
index f9b4b4b49301..0bdf8e3e6971 100644
--- a/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild
+++ b/net-wireless/wepdecrypt/wepdecrypt-0.8.ebuild
@@ -1,12 +1,13 @@
 # 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.9 2011/03/20 20:02:37 jlec Exp $
+# $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"
+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"
@@ -15,11 +16,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X"
-RDEPEND="X? ( x11-libs/fltk:1 )
-	sys-libs/zlib
+RDEPEND="
+	dev-libs/openssl
 	net-libs/libpcap
-	dev-libs/openssl"
-
+	sys-libs/zlib
+	X? ( x11-libs/fltk:1 )"
 DEPEND="${RDEPEND}"
 
 src_unpack() {