Reverting changes made by Ryan Hill on 19 May 2007 until we obtain an explanation of what the upcoming changes are.

Package-Manager: portage-2.1.2.7

4 files changed, 28 insertions, 23 deletions

diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index 6f8350a1d891..e84c1a8558a1 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.17 2007/05/19 09:02:50 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.18 2007/05/30 06:23:32 calchan Exp $
+
+  30 May 2007; Denis Dupeyron <calchan@gentoo.org> kicad-20060828.ebuild,
+  kicad-20070115.ebuild:
+  Reverting changes made by Ryan Hill on 19 May 2007 until we obtain an
+  explanation of what the upcoming changes are.
 
   19 May 2007; Ryan Hill <dirtyepic@gentoo.org> kicad-20060828.ebuild,
   kicad-20070115.ebuild:
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 20abe3937df0..48c9cd8cd59f 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 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
+EBUILD kicad-20060828.ebuild 3450 RMD160 89140a977d60a20de456341a4e347d88385614b3 SHA1 63ac8f5a7e654885e72863820efc7d748da5511f SHA256 1c217e131faf879590ed0b83dc86cae8c424e18d4bacf82251cb61aac4f353ee
+MD5 07db0bd5f20ee15a922f0afa76f3a2b5 kicad-20060828.ebuild 3450
+RMD160 89140a977d60a20de456341a4e347d88385614b3 kicad-20060828.ebuild 3450
+SHA256 1c217e131faf879590ed0b83dc86cae8c424e18d4bacf82251cb61aac4f353ee kicad-20060828.ebuild 3450
+EBUILD kicad-20070115.ebuild 3456 RMD160 62aab0f39a52710960696f0793a24beeeb00fc36 SHA1 257c9dc3eca2eb68db7bb87b7fbed03d4ca58df1 SHA256 79bb495fa4c65c281f2e8e829a746ae0d3aa762a5d0037d774d6e357e23e07e9
+MD5 303afaeff9dba341b6b6d4eb3f340915 kicad-20070115.ebuild 3456
+RMD160 62aab0f39a52710960696f0793a24beeeb00fc36 kicad-20070115.ebuild 3456
+SHA256 79bb495fa4c65c281f2e8e829a746ae0d3aa762a5d0037d774d6e357e23e07e9 kicad-20070115.ebuild 3456
+MISC ChangeLog 2726 RMD160 62fa10485dacb7e54db6e38d257165649fa96aeb SHA1 0426fcf1bfbb0f8bbaa01ac1e7bc8a211e732785 SHA256 bfdf8c3c8dd7455705be35f97473d87699b014c6973607fa1ac997aef43dcc12
+MD5 fcb730d9619240bd6315e8d431215ded ChangeLog 2726
+RMD160 62fa10485dacb7e54db6e38d257165649fa96aeb ChangeLog 2726
+SHA256 bfdf8c3c8dd7455705be35f97473d87699b014c6973607fa1ac997aef43dcc12 ChangeLog 2726
 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 0cfcc994e70d..40a3d58863da 100644
--- a/sci-electronics/kicad/kicad-20060828.ebuild
+++ b/sci-electronics/kicad/kicad-20060828.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-20060828.ebuild,v 1.2 2007/05/19 09:02:50 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20060828.ebuild,v 1.3 2007/05/30 06:23:32 calchan 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.
-	WX_GTK_VER="2.6"
+	# 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)
 
 	# 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 fdc56fd09f1e..2805641f348f 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.4 2007/05/19 09:02:50 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070115.ebuild,v 1.5 2007/05/30 06:23:32 calchan 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.
-	WX_GTK_VER="2.6"
+	# 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)
 
 	# 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() {