Fix wxwidgets.eclass usage to work with upcoming changes.

Package-Manager: portage-2.1.2.7

4 files changed, 28 insertions, 24 deletions

diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index 9544d03d461e..6f8350a1d891 100644
--- a/sci-electronics/kicad/ChangeLog
+++ b/sci-electronics/kicad/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2007/04/12 13:11:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.17 2007/05/19 09:02:50 dirtyepic Exp $
+
+  19 May 2007; Ryan Hill <dirtyepic@gentoo.org> kicad-20060828.ebuild,
+  kicad-20070115.ebuild:
+  Fix wxwidgets.eclass usage to work with upcoming changes.
 
   12 Apr 2007; Markus Rothe <corsair@gentoo.org> kicad-20070115.ebuild:
   Added ~ppc64
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index bd703fa81fba..20abe3937df0 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -2,18 +2,18 @@ DIST kicad-2006-08-28.tgz 58438630 RMD160 7e14ca52b0fd71385b24bb98f02c30cb488b8c
 DIST kicad-20060828.tar.bz2 11314983 RMD160 183eefd26e6ceb0623a314a2348e08e7c1470bd6 SHA1 a26a748e77ae8b64fe843e12ce35fbe2101e60ba SHA256 d2d203c77f18c60d98f3d19150bce9ceba41810c147c3d59d820d4d683ca5ef1
 DIST kicad-2007-01-15.tgz 61333975 RMD160 122313a847ab78bc8e7c796956b7df84e8c789d7 SHA1 347324baf943efb8ea6c21a709fefa1119aa0119 SHA256 10a2ada595dd84d54fbe013f3230894999996660916698eae78773fd168b4ba1
 DIST kicad-20070115.tar.bz2 11653448 RMD160 3ca516324aabb8fd7b6038fba34603298bf612de SHA1 21d2e865c064173d8b346386b4ba7c9800fd383d SHA256 0c9cfb0241714207498a71122570e453389d977ad33942bac68cec154cfbed35
-EBUILD kicad-20060828.ebuild 3450 RMD160 27c486202fcdedde2917a6b1ab4a419960457f2d SHA1 0e0bf1c6b5724996ffa8715c0019801a54cdad7a SHA256 2794fbdca7a3493d1c22ced9dadf3f8433c8eca604e05442d0b9d539eb6ae518
-MD5 db424ccc4427b591cb8b37a8b909b2d8 kicad-20060828.ebuild 3450
-RMD160 27c486202fcdedde2917a6b1ab4a419960457f2d kicad-20060828.ebuild 3450
-SHA256 2794fbdca7a3493d1c22ced9dadf3f8433c8eca604e05442d0b9d539eb6ae518 kicad-20060828.ebuild 3450
-EBUILD kicad-20070115.ebuild 3456 RMD160 9172d99b4439b1abc2c92bfc9eea8236f7ad23ed SHA1 1aaab5b2c1474f40bfbd57b08fc9049bc71c7b06 SHA256 48858cf2eb6d42272556764311de118e383337a3e450e15db40cc6d980338bc6
-MD5 591a7bc0ef34da6d26d5061b9c96ebe2 kicad-20070115.ebuild 3456
-RMD160 9172d99b4439b1abc2c92bfc9eea8236f7ad23ed kicad-20070115.ebuild 3456
-SHA256 48858cf2eb6d42272556764311de118e383337a3e450e15db40cc6d980338bc6 kicad-20070115.ebuild 3456
-MISC ChangeLog 2349 RMD160 9b8e5c32b2a1e81574bf510dfe126391b03d3945 SHA1 bbc9c01e42f590424ffaa6d621bc3020bfd17f52 SHA256 bea6dc49e2f9b252dbb1a14329c5eeab77da53d5eaf18dd7c34b43c504cd17d5
-MD5 e3325f76e27a41b65325723e79683120 ChangeLog 2349
-RMD160 9b8e5c32b2a1e81574bf510dfe126391b03d3945 ChangeLog 2349
-SHA256 bea6dc49e2f9b252dbb1a14329c5eeab77da53d5eaf18dd7c34b43c504cd17d5 ChangeLog 2349
+EBUILD kicad-20060828.ebuild 3367 RMD160 c34f2d06a3974dc02b66d8b445726eb447ec2b2a SHA1 1dc4726cdad426f63165953f97899c2dec426d65 SHA256 ab043ee5e4892d96beb1bf6b19fb618522e865c2f3e056be8f8cacc1751f4c6e
+MD5 8aab8bcf20141477f97136bfd009e10d kicad-20060828.ebuild 3367
+RMD160 c34f2d06a3974dc02b66d8b445726eb447ec2b2a kicad-20060828.ebuild 3367
+SHA256 ab043ee5e4892d96beb1bf6b19fb618522e865c2f3e056be8f8cacc1751f4c6e kicad-20060828.ebuild 3367
+EBUILD kicad-20070115.ebuild 3373 RMD160 a2867f5435bc6a9ddfad85c92a100d9afeaf7aca SHA1 00b3ea4728e12b0d29b77ce384fafe0a60f403b4 SHA256 12a3f2a2bf3a10c9e2b45296490ec403babb5fa788ddb2021bb2f46acd220a3a
+MD5 a8a65892e27eb6b501aeb1c229fcc0de kicad-20070115.ebuild 3373
+RMD160 a2867f5435bc6a9ddfad85c92a100d9afeaf7aca kicad-20070115.ebuild 3373
+SHA256 12a3f2a2bf3a10c9e2b45296490ec403babb5fa788ddb2021bb2f46acd220a3a kicad-20070115.ebuild 3373
+MISC ChangeLog 2508 RMD160 df076fd814df8822226b2824253aef5d9f89b820 SHA1 722cbe76f693d2cd90694c48db62f31e71499760 SHA256 bb039c5cd87cd8cb24ff0e7b6ac98003edaa18b31cd2fbe28ecf441499438018
+MD5 fa79ec77dca9d959af590d8e49933274 ChangeLog 2508
+RMD160 df076fd814df8822226b2824253aef5d9f89b820 ChangeLog 2508
+SHA256 bb039c5cd87cd8cb24ff0e7b6ac98003edaa18b31cd2fbe28ecf441499438018 ChangeLog 2508
 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-20060828.ebuild b/sci-electronics/kicad/kicad-20060828.ebuild
index b0f69dcb6af6..0cfcc994e70d 100644
--- a/sci-electronics/kicad/kicad-20060828.ebuild
+++ b/sci-electronics/kicad/kicad-20060828.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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-20060828.ebuild,v 1.1 2006/09/12 05:41:00 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20060828.ebuild,v 1.2 2007/05/19 09:02:50 dirtyepic Exp $
 
 inherit wxwidgets
 
@@ -15,12 +15,12 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="unicode doc examples minimal"
 
-DEPEND=">=x11-libs/wxGTK-2.6
+DEPEND="=x11-libs/wxGTK-2.6*
 	media-gfx/wings"
 
 pkg_setup() {
-	# Tell wxwidgets.eclass the version we need. We pick the latest on the system.
-	WX_GTK_VER=$(`ls /usr/bin/wx-config* | sort | tail -n 1` --release)
+	# Tell wxwidgets.eclass the version we need.
+	WX_GTK_VER="2.6"
 
 	# Check for proper wxGTK USE flags.
 	if use unicode; then
@@ -28,7 +28,7 @@ pkg_setup() {
 	else
 		need-wxwidgets gtk2 || die "You need to install wxGTK with gtk2 support."
 	fi
-	built_with_use ">=x11-libs/wxGTK-${WX_GTK_VER}" opengl || die "You need to install wxGTK with opengl support."
+	built_with_use "=x11-libs/wxGTK-${WX_GTK_VER}*" opengl || die "You need to install wxGTK with opengl support."
 }
 
 src_unpack() {
diff --git a/sci-electronics/kicad/kicad-20070115.ebuild b/sci-electronics/kicad/kicad-20070115.ebuild
index 559c5b5501d2..fdc56fd09f1e 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.3 2007/04/12 13:11:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070115.ebuild,v 1.4 2007/05/19 09:02:50 dirtyepic Exp $
 
 inherit wxwidgets
 
@@ -15,12 +15,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 x86"
 IUSE="unicode doc examples minimal"
 
-DEPEND=">=x11-libs/wxGTK-2.6
+DEPEND="=x11-libs/wxGTK-2.6*
 	media-gfx/wings"
 
 pkg_setup() {
-	# Tell wxwidgets.eclass the version we need. We pick the latest on the system.
-	WX_GTK_VER=$(`ls /usr/bin/wx-config* | sort | tail -n 1` --release)
+	# Tell wxwidgets.eclass the version we need.
+	WX_GTK_VER="2.6"
 
 	# Check for proper wxGTK USE flags.
 	if use unicode; then
@@ -28,7 +28,7 @@ pkg_setup() {
 	else
 		need-wxwidgets gtk2 || die "You need to install wxGTK with gtk2 support."
 	fi
-	built_with_use ">=x11-libs/wxGTK-${WX_GTK_VER}" opengl || die "You need to install wxGTK with opengl support."
+	built_with_use "=x11-libs/wxGTK-${WX_GTK_VER}*" opengl || die "You need to install wxGTK with opengl support."
 }
 
 src_unpack() {