Modernize the need-wxwidgets handling and fix the non-unicode case for bug 202007

(Portage version: 2.1.4_rc9)

4 files changed, 18 insertions, 13 deletions

diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index 07695acf5959..fb91858cf691 100644
--- a/sci-electronics/kicad/ChangeLog
+++ b/sci-electronics/kicad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-electronics/kicad
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.28 2007/12/12 09:17:27 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.29 2007/12/12 11:08:52 leio Exp $
+
+  12 Dec 2007; Mart Raudsepp <leio@gentoo.org> kicad-20070115.ebuild,
+  kicad-20070525.ebuild, kicad-20070702.ebuild:
+  Modernize the need-wxwidgets handling and fix the non-unicode case for bug
+  202007
 
   12 Dec 2007; Denis Dupeyron <calchan@gentoo.org> kicad-20070115.ebuild,
   kicad-20070525.ebuild, kicad-20070702.ebuild:
diff --git a/sci-electronics/kicad/kicad-20070115.ebuild b/sci-electronics/kicad/kicad-20070115.ebuild
index c4c5c1842e65..ac49f9dc39ce 100644
--- a/sci-electronics/kicad/kicad-20070115.ebuild
+++ b/sci-electronics/kicad/kicad-20070115.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070115.ebuild,v 1.11 2007/12/12 09:17:27 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070115.ebuild,v 1.12 2007/12/12 11:08:52 leio Exp $
 
 inherit wxwidgets
 
@@ -21,11 +21,11 @@ pkg_setup() {
 	# Tell wxwidgets.eclass which version we need
 	WX_GTK_VER="2.6"
 
-	# Check for proper wxGTK USE flags.
+	# Ask for the correct wxGTK configuration
 	if use unicode; then
-		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+		need-wxwidgets unicode
 	else
-		need-wxwidgets X || die "You need to install wxGTK with X support."
+		need-wxwidgets ansi
 	fi
 	built_with_use "=x11-libs/wxGTK-${WX_GTK_VER}*" opengl || die "You need to install wxGTK with opengl support."
 }
diff --git a/sci-electronics/kicad/kicad-20070525.ebuild b/sci-electronics/kicad/kicad-20070525.ebuild
index 9b53ef26848b..f309d03f5839 100644
--- a/sci-electronics/kicad/kicad-20070525.ebuild
+++ b/sci-electronics/kicad/kicad-20070525.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070525.ebuild,v 1.6 2007/12/12 09:17:27 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070525.ebuild,v 1.7 2007/12/12 11:08:52 leio Exp $
 
 inherit wxwidgets
 
@@ -21,11 +21,11 @@ pkg_setup() {
 	# Tell wxwidgets.eclass which version we need
 	WX_GTK_VER="2.6"
 
-	# Check for proper wxGTK USE flags.
+	# Ask for the correct wxGTK configuration
 	if use unicode; then
-		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+		need-wxwidgets unicode
 	else
-		need-wxwidgets X || die "You need to install wxGTK with X support."
+		need-wxwidgets ansi
 	fi
 	built_with_use "=x11-libs/wxGTK-${WX_GTK_VER}*" opengl || die "You need to install wxGTK with opengl support."
 }
diff --git a/sci-electronics/kicad/kicad-20070702.ebuild b/sci-electronics/kicad/kicad-20070702.ebuild
index 97112e79a02c..d20487e2b334 100644
--- a/sci-electronics/kicad/kicad-20070702.ebuild
+++ b/sci-electronics/kicad/kicad-20070702.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070702.ebuild,v 1.3 2007/12/12 09:17:27 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070702.ebuild,v 1.4 2007/12/12 11:08:52 leio Exp $
 
 inherit eutils wxwidgets
 
@@ -21,11 +21,11 @@ pkg_setup() {
 	# Tell wxwidgets.eclass which version we need
 	WX_GTK_VER="2.6"
 
-	# Check for proper wxGTK USE flags.
+	# Ask for the correct wxGTK configuration
 	if use unicode; then
-		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+		need-wxwidgets unicode
 	else
-		need-wxwidgets X || die "You need to install wxGTK with X support."
+		need-wxwidgets ansi
 	fi
 	built_with_use "=x11-libs/wxGTK-${WX_GTK_VER}*" opengl || die "You need to install wxGTK with opengl support."
 }