Make conditional so we don't die w/ USE="-wxwidgets" when wxGTK

was built with USE="-X".
(Portage version: 2.2_rc62/cvs/Linux x86_64)

5 files changed, 26 insertions, 9 deletions

diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index 7871e31b4ca7..9a058b34b2f1 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-backup/bacula
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.80 2010/02/10 01:24:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.81 2010/02/10 06:12:03 dirtyepic Exp $
+
+  10 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> bacula-2.4.1-r1.ebuild,
+  bacula-2.4.4.ebuild, bacula-3.0.2.ebuild, bacula-3.0.3.ebuild:
+  Make conditional so we don't die w/ USE="-wxwidgets" when wxGTK
+  was built with USE="-X".
 
   10 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> bacula-2.4.1-r1.ebuild,
   bacula-2.4.4.ebuild, bacula-3.0.2.ebuild, bacula-3.0.3.ebuild:
diff --git a/app-backup/bacula/bacula-2.4.1-r1.ebuild b/app-backup/bacula/bacula-2.4.1-r1.ebuild
index ad0d2e545a1d..a668cd861fed 100644
--- a/app-backup/bacula/bacula-2.4.1-r1.ebuild
+++ b/app-backup/bacula/bacula-2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild,v 1.10 2010/02/10 01:24:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild,v 1.11 2010/02/10 06:12:03 dirtyepic Exp $
 
 #
 # TODO:
@@ -23,7 +23,6 @@
 #
 
 EAPI="1"
-WX_GTK_VER=2.6
 inherit eutils wxwidgets
 
 IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd doc gnome ipv6 logrotate logwatch mysql postgres python qt4 readline sqlite sqlite3 ssl static tcpd wxwidgets X"
@@ -194,6 +193,10 @@ src_compile() {
 			eerror "the qt4 USE flag to disable building 'bat'."
 			die "incompatible slotted qwt version found"
 		fi
+		if useq wxwidgets; then
+			WX_GTK_VER=2.6
+			need-wxwidgets ansi
+		fi
 		myconf="${myconf} \
 			$(use_with X x) \
 			$(use_enable gnome) \
diff --git a/app-backup/bacula/bacula-2.4.4.ebuild b/app-backup/bacula/bacula-2.4.4.ebuild
index 71996a6c275c..cb0f5540dd5b 100644
--- a/app-backup/bacula/bacula-2.4.4.ebuild
+++ b/app-backup/bacula/bacula-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild,v 1.5 2010/02/10 01:24:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild,v 1.6 2010/02/10 06:12:03 dirtyepic Exp $
 
 #
 # TODO:
@@ -21,7 +21,6 @@
 #
 
 EAPI="2"
-WX_GTK_VER="2.6"
 inherit eutils wxwidgets
 
 IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd doc gnome ipv6 logrotate logwatch mysql postgres python qt4 readline sqlite sqlite3 ssl static tcpd wxwidgets X"
@@ -182,6 +181,10 @@ src_configure() {
 			eerror "the qt4 USE flag to disable building 'bat'."
 			die "incompatible slotted qwt version found"
 		fi
+		if useq wxwidgets; then
+			WX_GTK_VER=2.6
+			need-wxwidgets ansi
+		fi
 		myconf="${myconf} \
 			$(use_with X x) \
 			$(use_enable gnome) \
diff --git a/app-backup/bacula/bacula-3.0.2.ebuild b/app-backup/bacula/bacula-3.0.2.ebuild
index f54e12799c17..ae7f1affec9c 100644
--- a/app-backup/bacula/bacula-3.0.2.ebuild
+++ b/app-backup/bacula/bacula-3.0.2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild,v 1.5 2010/02/10 01:24:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild,v 1.6 2010/02/10 06:12:03 dirtyepic Exp $
 
 EAPI="2"
-WX_GTK_VER=2.6
 inherit eutils wxwidgets
 
 IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd gnome ipv6 logwatch mysql postgres python qt4 readline sqlite +sqlite3 ssl static tcpd wxwidgets X"
@@ -171,6 +170,10 @@ src_configure() {
 			eerror "the qt4 USE flag to disable building 'bat'."
 			die "incompatible slotted qwt version found"
 		fi
+		if useq wxwidgets; then
+			WX_GTK_VER=2.6
+			need-wxwidgets ansi
+		fi
 		myconf="${myconf} \
 			$(use_with X x) \
 			$(use_enable gnome) \
diff --git a/app-backup/bacula/bacula-3.0.3.ebuild b/app-backup/bacula/bacula-3.0.3.ebuild
index c62cbb97ecb9..3ab46209ad4a 100644
--- a/app-backup/bacula/bacula-3.0.3.ebuild
+++ b/app-backup/bacula/bacula-3.0.3.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v 1.3 2010/02/10 01:24:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v 1.4 2010/02/10 06:12:03 dirtyepic Exp $
 
 EAPI="2"
-WX_GTK_VER=2.6
 inherit eutils wxwidgets
 
 IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd gnome ipv6 logwatch mysql postgres python qt4 readline sqlite +sqlite3 ssl static tcpd wxwidgets X"
@@ -171,6 +170,10 @@ src_configure() {
 			eerror "the qt4 USE flag to disable building 'bat'."
 			die "incompatible slotted qwt version found"
 		fi
+		if useq wxwidgets; then
+			WX_GTK_VER=2.6
+			need-wxwidgets ansi
+		fi
 		myconf="${myconf} \
 			$(use_with X x) \
 			$(use_enable gnome) \