Fix detection of fltk:1, #359645

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

5 files changed, 42 insertions, 21 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/Manifest b/net-wireless/wepdecrypt/Manifest
index d137d56a529f..91723ab23b97 100644
--- a/net-wireless/wepdecrypt/Manifest
+++ b/net-wireless/wepdecrypt/Manifest
@@ -3,15 +3,16 @@ Hash: SHA1
 
 AUX wepdecrypt-0.8-buffer.patch 588 RMD160 e5e57254abb57ba7a6dda03c2507ca2f45f2e1ca SHA1 9be03ae6f043ca81305d5b6aa4b70317c84e4836 SHA256 efccf595b5215be69b587bcfad2520f3c1030df7aa3b976f36c01b1faaa00a75
 AUX wepdecrypt-0.8-build.patch 1249 RMD160 84e4cc84f575eb73ed97e069b040eca1ea6c587d SHA1 a37a430a0407d924acf6b9018660165bd1812687 SHA256 9867321bc33988b271d73d22e1d61d9e0d9a6175e435ba4dd1008d05c650ffce
+AUX wepdecrypt-0.8-fltk.patch 534 RMD160 5cfb26fe2054eee5bf107b40b3fddf6bebc3e9bd SHA1 85bdf5eca0464c1fca5ca8cf87d67d45df4e6ba8 SHA256 d78166f79b046a3a155126f116b5cf01bbedd8104f8b949bda9ff5fdc682a442
 DIST wepdecrypt-0.8.tar.gz 90260 RMD160 8fb6ed688edef8220bc1b8f523b2ecfeaa412bdc SHA1 8f75e70ee27d7486a90e9ae631020c2f622ee48e SHA256 1c7cef077af4c162df1724d9149a15c231bf6c771380bb5789e66fb03f92c381
-EBUILD wepdecrypt-0.8-r1.ebuild 1024 RMD160 a6f569fbcd65038c7b9282f8878e6837a8c4856b SHA1 77a5a2787974fb97ad70d061314d8bd04f714bce SHA256 296ec37d890f91c6e432ce78abce8827dd3cdb7a1d9398d8c6ea0bce759d4908
-EBUILD wepdecrypt-0.8.ebuild 952 RMD160 e73c5e3aa206086e119d7738cc0758c896a4386a SHA1 c10337199077535f851db683cd0a9ddbb24412bf SHA256 862f23c1492ef3ea7fa6b193385aa4ef5b39251c34d08e311bcd250ef2a08c9e
-MISC ChangeLog 2786 RMD160 5e84ffbf665bcc81afdebcf1d4f27f837069232c SHA1 ee80a405c830c1076fceb9e37b552e310d0f37b3 SHA256 fa650d6fe0bfdec26183a2be259bf37089ba5801b31bf586d21f9e255e25d740
+EBUILD wepdecrypt-0.8-r1.ebuild 1006 RMD160 a5d232821aef0db5736f2849c59dfa91dc98085e SHA1 d5d456b94ca41e335122b4678f127dac0655602f SHA256 59b335a1640c832c3e633cf974f18345c528383f36198798ebd86aec7e223d49
+EBUILD wepdecrypt-0.8.ebuild 953 RMD160 2e8baf243fe05da7f6b8c76e77c5e23ec2558d7e SHA1 d1bbee2bc88626c48bf86eba280b4ec158cd69d2 SHA256 54e435d6919ccef4ac67a45b82849e10df42ae79b37a24ba3f5b29d9c97cea30
+MISC ChangeLog 2954 RMD160 c2969ef7b0484ea1848b8edb9812228d0e0e534c SHA1 9ea8e591dfb214d3420802cffac4b0966fdec5bc SHA256 c8510dbf770968c864b54f55748b84b583770cf7df791b9f6a882787b20234af
 MISC metadata.xml 251 RMD160 9c13ff790c7419d4e0d2d370036b7f4e4594ea4f SHA1 563aa19984b291a6cade6d6487dbf4a2a17e6874 SHA256 1739a4e8833a2a5b9501182eb830cbd3e26014ccef5e9ae1b4d7a0686c665c1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2GXWMACgkQgAnW8HDreRaFkwCeNtrOXdlDxmDh+SMPAqKC/kqp
-OioAoIHFlnNAONfbHIdpoNyQBhaHNlfA
-=5a6J
+iEYEARECAAYFAk3p1YMACgkQgAnW8HDreRbs4wCgsiTGvFhGzwVeGpIDN/FWAvoY
+/DkAnRhlz0yR4TXO9skQ1WAOUe8+PUG3
+=VHUR
 -----END PGP SIGNATURE-----
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() {