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

Package-Manager: portage-2.1.4_rc9

5 files changed, 34 insertions, 29 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/Manifest b/sci-electronics/kicad/Manifest
index 380bf05a00a5..16307557463c 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -8,22 +8,22 @@ DIST kicad-2007-07-02.tgz 62664384 RMD160 7f80fc895ab8f737216d88a61100acb089869b
 DIST kicad-20070115.tar.bz2 11653448 RMD160 3ca516324aabb8fd7b6038fba34603298bf612de SHA1 21d2e865c064173d8b346386b4ba7c9800fd383d SHA256 0c9cfb0241714207498a71122570e453389d977ad33942bac68cec154cfbed35
 DIST kicad-20070525.tar.bz2 11075020 RMD160 96c019dfb9437d967d001a5343bcae2c4e9dea11 SHA1 df7fb34bf0ee2358633479cc6c98319afe9c3901 SHA256 cc5e776671a293ab8b67843957ec35a3820803556e5ff778b636e841b390a2d1
 DIST kicad-20070702.tar.bz2 11115678 RMD160 af141117d233c91ae930b8839cbd3cf4a997c821 SHA1 6cbc4c7e9259210a49d5cc252e12e800aac59e62 SHA256 91238183d588164397579fd3ff4b5531ffcd82d7d5fd36dd4ef5b2172aafeabc
-EBUILD kicad-20070115.ebuild 3504 RMD160 b455f40f75677732a899d5d7c754646e86ea49f8 SHA1 8f2f51ce064322aafcb2ab4d3b1915da2ca8f94e SHA256 b06d31eb8dbf81040061f682a7ad116b5f460606ac3a73d6ca2159d3ec666348
-MD5 75493576663cc3ef9da7fb44f69f2159 kicad-20070115.ebuild 3504
-RMD160 b455f40f75677732a899d5d7c754646e86ea49f8 kicad-20070115.ebuild 3504
-SHA256 b06d31eb8dbf81040061f682a7ad116b5f460606ac3a73d6ca2159d3ec666348 kicad-20070115.ebuild 3504
-EBUILD kicad-20070525.ebuild 3966 RMD160 a848d9ce7201a8bbd34d9328e09f57f24bda35d6 SHA1 0ba549428390ba6af7360350c0b0cbbd5f8f066b SHA256 f1d02ef0fbe1273582b46c23f0e024d3803e623148007d83a1d364ae3c229f8b
-MD5 8d0963842fb58d1482164ea66ea3246e kicad-20070525.ebuild 3966
-RMD160 a848d9ce7201a8bbd34d9328e09f57f24bda35d6 kicad-20070525.ebuild 3966
-SHA256 f1d02ef0fbe1273582b46c23f0e024d3803e623148007d83a1d364ae3c229f8b kicad-20070525.ebuild 3966
-EBUILD kicad-20070702.ebuild 4039 RMD160 5036f5073a64a3959afb415db487893e545e986f SHA1 24efebfc6fe56c63eeaa27520fa7e2ad263d705e SHA256 700e2c78044c116304c21a882e29ba9c3b340d306034171f4e1cdef1b118b02c
-MD5 2b804b86082d43f1c4e8c83f8b975240 kicad-20070702.ebuild 4039
-RMD160 5036f5073a64a3959afb415db487893e545e986f kicad-20070702.ebuild 4039
-SHA256 700e2c78044c116304c21a882e29ba9c3b340d306034171f4e1cdef1b118b02c kicad-20070702.ebuild 4039
-MISC ChangeLog 4257 RMD160 fd4b07fcd38dbbda2bdee02fe3cb702ae2defeb0 SHA1 bbc8b8cdb6a21a2dfc6364e4c2e9bf4ef7641860 SHA256 173cc9021f60122ac497dc33f35b9629934e0577494b47e9cd7a57960b9a888c
-MD5 49c7544e3098919a70a764884554fe53 ChangeLog 4257
-RMD160 fd4b07fcd38dbbda2bdee02fe3cb702ae2defeb0 ChangeLog 4257
-SHA256 173cc9021f60122ac497dc33f35b9629934e0577494b47e9cd7a57960b9a888c ChangeLog 4257
+EBUILD kicad-20070115.ebuild 3402 RMD160 549ab2543bdd422b31693ce5dff3b8f69b28a86b SHA1 b7b4ca5b76788dc1acbecc23e0c1b17969421425 SHA256 7329058f81e55d1a2f0d2c5ea65712ce96443bd154592708d249901ee1fe3df6
+MD5 b5985d399a8b3b8668f701691ba4a875 kicad-20070115.ebuild 3402
+RMD160 549ab2543bdd422b31693ce5dff3b8f69b28a86b kicad-20070115.ebuild 3402
+SHA256 7329058f81e55d1a2f0d2c5ea65712ce96443bd154592708d249901ee1fe3df6 kicad-20070115.ebuild 3402
+EBUILD kicad-20070525.ebuild 3864 RMD160 429603656becd37e3ff4b9ef018afe93286ece9a SHA1 bef4c5923d532a7e5ccdc318247bc05a3afdd5ad SHA256 141fb4f30008a7398954215a03e8eb9b52706e4fe14774fc8259ccf6795186f2
+MD5 bdc9b5671e757ada5cf7fb3351e5945f kicad-20070525.ebuild 3864
+RMD160 429603656becd37e3ff4b9ef018afe93286ece9a kicad-20070525.ebuild 3864
+SHA256 141fb4f30008a7398954215a03e8eb9b52706e4fe14774fc8259ccf6795186f2 kicad-20070525.ebuild 3864
+EBUILD kicad-20070702.ebuild 3937 RMD160 fddf1c5c3cc11aa7d00a1a77b5370e8677bdcedd SHA1 0c7febb05c4cdd7cf42a0a3032dd1f99f0b11521 SHA256 45d3d3c91fb0873e2589fe13ec6d7bf582ef7c529b48ae0ab65261d1347a21ac
+MD5 2c9b9a5deb7659bdeed03c5ab080aa0e kicad-20070702.ebuild 3937
+RMD160 fddf1c5c3cc11aa7d00a1a77b5370e8677bdcedd kicad-20070702.ebuild 3937
+SHA256 45d3d3c91fb0873e2589fe13ec6d7bf582ef7c529b48ae0ab65261d1347a21ac kicad-20070702.ebuild 3937
+MISC ChangeLog 4459 RMD160 59f0edb4e5c7289699831dc5d5c51a00578d646a SHA1 4f7f9732679e27e96391e4bcec2b2cd01c399198 SHA256 8da197eb21c366498a9ad43384318010ce4333604ad95da183316c01b47ea246
+MD5 524ac2e3c00b713588b419937432e7c0 ChangeLog 4459
+RMD160 59f0edb4e5c7289699831dc5d5c51a00578d646a ChangeLog 4459
+SHA256 8da197eb21c366498a9ad43384318010ce4333604ad95da183316c01b47ea246 ChangeLog 4459
 MISC metadata.xml 339 RMD160 edfadf44bb7c0a6049e40379258ccfbe89b74b5f SHA1 387abeb29f7e875057901f84b2bdb77c4f942c2e SHA256 311ce02a24351429c5d83af4292d0b8fa315ffde140ba06ac64e6bf3c233d173
 MD5 cf9f0a7798ab8fd2681122e170b0674c metadata.xml 339
 RMD160 edfadf44bb7c0a6049e40379258ccfbe89b74b5f metadata.xml 339
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."
 }