Revert back to conditional so we don't die with USE="-wxwidgets" when

wxGTK
was built with USE="-X".
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

6 files changed, 39 insertions, 21 deletions

diff --git a/app-emulation/bochs/ChangeLog b/app-emulation/bochs/ChangeLog
index d4efa5fb4fdc..5d5cf1dd4158 100644
--- a/app-emulation/bochs/ChangeLog
+++ b/app-emulation/bochs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/bochs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.86 2010/02/10 03:52:03 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/ChangeLog,v 1.87 2010/02/10 06:32:50 dirtyepic Exp $
+
+  10 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> bochs-2.3.ebuild,
+  bochs-2.3.6.ebuild, bochs-2.3.7.ebuild, bochs-2.4.1.ebuild:
+  Revert back to conditional so we don't die with USE="-wxwidgets" when
+  wxGTK
+  was built with USE="-X".
 
   10 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> bochs-2.3.ebuild,
   bochs-2.3.6.ebuild, bochs-2.3.7.ebuild, bochs-2.4.1.ebuild:
diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest
index fb6d15e7c337..cb94cd9da2f9 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -11,16 +11,16 @@ DIST bochs-2.3.7.tar.gz 3989982 RMD160 b4c9cb8e777c4e484f653085783bce9645804fe0
 DIST bochs-2.3.tar.gz 3812273 RMD160 545e0bf3edd0fdd073a107e835f90c65451c100e SHA1 2fe0dbdebd7fe9fe07d697bcbe1736bdaeb64aaf SHA256 fd926f3915d0619ddde8dedd02dac661f3233d77f3fc2ec7f94e1e028398497a
 DIST bochs-2.4.1.tar.gz 4046505 RMD160 c1b71ba4f6cef8710aa66a5e6862c7ccaf13d7eb SHA1 80a85bb7b8598298615db1216c4a8c3597666309 SHA256 d4fd63e328870d8a9452d8397c83a295b093d5d158386d1ef9b98f161f520ab3
 DIST dlxlinux4.tar.gz 1504868 RMD160 29fd31dd0f77edacecabd9f053206a486635e7f1 SHA1 b3f441cd71c54c71a8c21aa405e949bde02c1783 SHA256 68b35f850ce69f4050ed85064e15d756245d57e84ddc1d52678b0e2a97dbf73e
-EBUILD bochs-2.3.6.ebuild 2576 RMD160 8f673c437343ce394ab3454b3a55297db9ed822d SHA1 7dd1e9c43bfec5bfdc9c68139da0278494b88771 SHA256 e7e6f404958d06b598c04cbe9858f0baf812ad581b1004b6e2d2a31dd34c333a
-EBUILD bochs-2.3.7.ebuild 3307 RMD160 db014a2bc7739c30ea763546fca648608d30f2c2 SHA1 6b5b3c865bd266c9a2fd4c95bab4f465e82b4332 SHA256 ef8703d973494a95f43463bee824c6e17e82e8b7a75c44577ce20c95a87aab6f
-EBUILD bochs-2.3.ebuild 2882 RMD160 063c7d14314c860b09152f74e0dbc27e3f2f666e SHA1 fde337b4cf683b96f1f30cfae7430e501b3d027f SHA256 2cef373ca255340882b81620e6cb5371c4290531ee84f72b548efc1583b936be
-EBUILD bochs-2.4.1.ebuild 3144 RMD160 3d17be562eb22e7a7b994e418fdbe118b29cc50a SHA1 6343294465b3ce67bad5074fa9b580b632f4a186 SHA256 f7c7097d66fc349eaf30c8ccaedc1b077a501d626158d341088ec461527746a4
-MISC ChangeLog 11005 RMD160 43155767a4b41d7ae01ce8fa9d338d9c56fe3661 SHA1 9cf85198f6f75f93376fe74592b1c8e5cefea509 SHA256 912c4a5fff0a33c36b699f7c4d838ccaf55c52da77822fd0f7707ea3ad21cf5e
+EBUILD bochs-2.3.6.ebuild 2620 RMD160 b336ad665166636b95291b20a836794ebd462afa SHA1 a9875205066c317a2f3a4401ca0d4c6e950c9953 SHA256 394f7dd99cbe54ac0d5fb451b17228af10698c861d29d9e17e4f62b9b611559d
+EBUILD bochs-2.3.7.ebuild 3351 RMD160 862cbff09be4cd5b71b5592176389cf66049a033 SHA1 c75a76538e770ae25648b2a3cdd8b4b75aa54944 SHA256 71e6c4b89485ab21819a487c95c99835b799431f0b4f6ceed37f048ace26ec5c
+EBUILD bochs-2.3.ebuild 2927 RMD160 8e9fcf8c8a241821bc19b317c159237822158ae3 SHA1 add4b907308e57dd6db754d090b4e74a6eac2ecf SHA256 1a494ff7f2375d49e47f45cf598bf41052f083257adf0134589259830721adbd
+EBUILD bochs-2.4.1.ebuild 3188 RMD160 a8e5fa2123be8b4a7db76e9326cb5ad65c4f3846 SHA1 5cb281c8e3507a42cbfa60c62e9efe3be2eeeaec SHA256 ecb0e1d1e7e91ae95ea20ee8540995129149416ff1e1a5e02c933172768988d4
+MISC ChangeLog 11241 RMD160 a027c6586517a1884a7429cf4551cb3d9f2809fd SHA1 2860cacb9093a385f9bbaaad2c52d482e8814ee7 SHA256 a8460e8a35ac79f00f9d1397f7fe98c8b3cb26ec425b8e36a4cc2e9a7a1c3858
 MISC metadata.xml 292 RMD160 763d8dd9333f7e318c659a073bd837405d528e00 SHA1 8886f39ce9788c2d0a908106704ea9552ca3d78c SHA256 0d8960adac2ec04d372e9317aff221b788071bb3d31852560e4bebe1d2272a65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAktyLfYACgkQiqiDRvmkBmJXigCg78HT/RSgABztDD6/idodnWgd
-LX8AoLGE62Sg3Bfor1h3T8ombZ3OtRcL
-=cmTq
+iEYEARECAAYFAktyU6UACgkQiqiDRvmkBmISoACePZSE1sPtT7Mv6syTfYO+RFEW
+WpwAnjdmWkSuF6oKA3xUKGM9xm5HsyzH
+=kxjL
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/bochs/bochs-2.3.6.ebuild b/app-emulation/bochs/bochs-2.3.6.ebuild
index 2947c5d59cd6..e8f811eb3a13 100644
--- a/app-emulation/bochs/bochs-2.3.6.ebuild
+++ b/app-emulation/bochs/bochs-2.3.6.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.6.ebuild,v 1.5 2010/02/10 03:52:03 dirtyepic Exp $
-
-WX_GTK_VER=2.6
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.6.ebuild,v 1.6 2010/02/10 06:32:50 dirtyepic Exp $
 
 inherit eutils wxwidgets
 
@@ -44,6 +42,11 @@ src_unpack() {
 }
 
 src_compile() {
+	WX_GTK_VER=2.6
+
+	use wxwidgets && \
+		need-wxwidgets ansi
+
 	use x86 && \
 		myconf="--enable-idle-hack --enable-fast-function-calls"
 
diff --git a/app-emulation/bochs/bochs-2.3.7.ebuild b/app-emulation/bochs/bochs-2.3.7.ebuild
index 3647951167ad..8d1363d1e337 100644
--- a/app-emulation/bochs/bochs-2.3.7.ebuild
+++ b/app-emulation/bochs/bochs-2.3.7.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild,v 1.7 2010/02/10 03:52:03 dirtyepic Exp $
-
-WX_GTK_VER=2.6
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.7.ebuild,v 1.8 2010/02/10 06:32:50 dirtyepic Exp $
 
 inherit eutils wxwidgets
 
@@ -47,6 +45,11 @@ src_unpack() {
 }
 
 src_compile() {
+	WX_GTK_VER=2.6
+
+	use wxwidgets && \
+		need-wxwidgets ansi
+
 	use x86 && \
 		myconf="--enable-idle-hack --enable-fast-function-calls"
 
diff --git a/app-emulation/bochs/bochs-2.3.ebuild b/app-emulation/bochs/bochs-2.3.ebuild
index 774272eb5c0c..131326699841 100644
--- a/app-emulation/bochs/bochs-2.3.ebuild
+++ b/app-emulation/bochs/bochs-2.3.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.ebuild,v 1.9 2010/02/10 03:52:03 dirtyepic Exp $
-
-WX_GTK_VER=2.6
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.3.ebuild,v 1.10 2010/02/10 06:32:50 dirtyepic Exp $
 
 inherit eutils wxwidgets autotools
 
@@ -52,6 +50,11 @@ src_unpack() {
 }
 
 src_compile() {
+	WX_GTK_VER=2.6
+
+	use wxwidgets && \
+		need-wxwidgets ansi
+
 	[[ "$ARCH" == "x86" ]] \
 		&& myconf="--enable-idle-hack --enable-fast-function-calls"
 	myconf="${myconf} `use_with sdl`"
diff --git a/app-emulation/bochs/bochs-2.4.1.ebuild b/app-emulation/bochs/bochs-2.4.1.ebuild
index 1c902e700d02..ce26c06806e3 100644
--- a/app-emulation/bochs/bochs-2.4.1.ebuild
+++ b/app-emulation/bochs/bochs-2.4.1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.4.1.ebuild,v 1.3 2010/02/10 03:52:03 dirtyepic Exp $
-
-WX_GTK_VER=2.6
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.4.1.ebuild,v 1.4 2010/02/10 06:32:50 dirtyepic Exp $
 
 inherit eutils wxwidgets
 
@@ -44,6 +42,11 @@ src_unpack() {
 }
 
 src_compile() {
+	WX_GTK_VER=2.6
+
+	use wxwidgets && \
+		need-wxwidgets ansi
+
 	use x86 && \
 		myconf="--enable-idle-hack --enable-fast-function-calls"