Locked required wxGTK to version 2.6 to prepare for new wxwidget eclass.

Package-Manager: portage-2.1.3_rc6

4 files changed, 27 insertions, 23 deletions

diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index 05f8377b1562..052a6cfdb8d0 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.24 2007/06/23 20:12:59 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.25 2007/07/07 08:44:26 calchan Exp $
+
+  07 Jul 2007; Denis Dupeyron <calchan@gentoo.org> kicad-20070115.ebuild,
+  kicad-20070525.ebuild:
+  Locked required wxGTK to version 2.6 to prepare for new wxwidget eclass.
 
   23 Jun 2007; Markus Rothe <corsair@gentoo.org> kicad-20070525.ebuild:
   Added ~ppc
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index d06e90455071..5ad36ae99157 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -2,18 +2,18 @@ DIST kicad-2007-01-15.tgz 61333975 RMD160 122313a847ab78bc8e7c796956b7df84e8c789
 DIST kicad-2007-05-25.tgz 61657926 RMD160 64c2cba01bd35bffb6e58174a05a536f70bf42a5 SHA1 a61ac54711fe4b993b3e6687e135aad9825eaa70 SHA256 82e3396fe405676471032997ffab10d054a5a731baf2c2e16921efeb4be65f90
 DIST kicad-20070115.tar.bz2 11653448 RMD160 3ca516324aabb8fd7b6038fba34603298bf612de SHA1 21d2e865c064173d8b346386b4ba7c9800fd383d SHA256 0c9cfb0241714207498a71122570e453389d977ad33942bac68cec154cfbed35
 DIST kicad-20070525.tar.bz2 11075020 RMD160 96c019dfb9437d967d001a5343bcae2c4e9dea11 SHA1 df7fb34bf0ee2358633479cc6c98319afe9c3901 SHA256 cc5e776671a293ab8b67843957ec35a3820803556e5ff778b636e841b390a2d1
-EBUILD kicad-20070115.ebuild 3537 RMD160 cb97dfd01df2bf434a309430aea2a5e972c71771 SHA1 6af972fafc846152cf6a85214d2ab4e8f9dab582 SHA256 af3bd834e89c0d40f7444c1a7f69ebdec56860f32eee681e517b7c8bf4d8c707
-MD5 9601f5b46780ee021ac40f9168f3fdd0 kicad-20070115.ebuild 3537
-RMD160 cb97dfd01df2bf434a309430aea2a5e972c71771 kicad-20070115.ebuild 3537
-SHA256 af3bd834e89c0d40f7444c1a7f69ebdec56860f32eee681e517b7c8bf4d8c707 kicad-20070115.ebuild 3537
-EBUILD kicad-20070525.ebuild 4000 RMD160 2aa54c05067df24b68515e1a5e3ffde881d14f83 SHA1 a51733cbf8ed7d3e40b7d1a752672ae212fc29ff SHA256 44d5467b2243a47e9a2b6828b45914e4882596049d5ec2c1f0ec6f8dc42adca4
-MD5 97a161e01ab55d4a6b6f51ad173eb654 kicad-20070525.ebuild 4000
-RMD160 2aa54c05067df24b68515e1a5e3ffde881d14f83 kicad-20070525.ebuild 4000
-SHA256 44d5467b2243a47e9a2b6828b45914e4882596049d5ec2c1f0ec6f8dc42adca4 kicad-20070525.ebuild 4000
-MISC ChangeLog 3551 RMD160 41eed24eb12fa2a12828e407584653c84c05f0e7 SHA1 81350fd216e10d357407d9e408e8477d27caaa5d SHA256 d89956a706ee28fb5d1ebe62bed02c0c61e16839e3d940476cf2a0f45ffe3619
-MD5 085132bbff6da1269c60770b6ace397a ChangeLog 3551
-RMD160 41eed24eb12fa2a12828e407584653c84c05f0e7 ChangeLog 3551
-SHA256 d89956a706ee28fb5d1ebe62bed02c0c61e16839e3d940476cf2a0f45ffe3619 ChangeLog 3551
+EBUILD kicad-20070115.ebuild 3453 RMD160 9d527faf9475f35dcdd8b391d855b704d2d0b397 SHA1 18057f4324e9403b46259b79ccbb0e2126cb2279 SHA256 349f9b6efc8b60098d3c972d48d1b91a40d84ce075c15d8ca62431581b45df2b
+MD5 9188829e9841734738e0b32bbe4a6c0d kicad-20070115.ebuild 3453
+RMD160 9d527faf9475f35dcdd8b391d855b704d2d0b397 kicad-20070115.ebuild 3453
+SHA256 349f9b6efc8b60098d3c972d48d1b91a40d84ce075c15d8ca62431581b45df2b kicad-20070115.ebuild 3453
+EBUILD kicad-20070525.ebuild 3916 RMD160 a6e1937d5595638c50e613b5c75bbdac19740f13 SHA1 aff7375cd592977c20b79e00636fe9504edfff5b SHA256 a803dede76f71ab5e75dc42a9d0ae48aee5d20bacf045e9dafa6474d728a06b9
+MD5 3ef09ff60c5df431ded228f7c2daad9a kicad-20070525.ebuild 3916
+RMD160 a6e1937d5595638c50e613b5c75bbdac19740f13 kicad-20070525.ebuild 3916
+SHA256 a803dede76f71ab5e75dc42a9d0ae48aee5d20bacf045e9dafa6474d728a06b9 kicad-20070525.ebuild 3916
+MISC ChangeLog 3726 RMD160 0d5b8132c3ca3ef7ebb0a9eca5b0279c8aeefc89 SHA1 3eed7acd1f5db3c78e1bf16bf584141b16f907e8 SHA256 8b4b20765e39da81de40d0d57c78c9031100474138a36feff96ff271c5d313ed
+MD5 0553a05b4113281b1c7a36c23c83663a ChangeLog 3726
+RMD160 0d5b8132c3ca3ef7ebb0a9eca5b0279c8aeefc89 ChangeLog 3726
+SHA256 8b4b20765e39da81de40d0d57c78c9031100474138a36feff96ff271c5d313ed ChangeLog 3726
 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 0603c6d66632..068b8c3d42e4 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.8 2007/06/06 19:59:14 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070115.ebuild,v 1.9 2007/07/07 08:44:26 calchan Exp $
 
 inherit wxwidgets
 
@@ -15,11 +15,11 @@ SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="unicode doc examples minimal"
 
-DEPEND=">=x11-libs/wxGTK-2.6"
+DEPEND="=x11-libs/wxGTK-2.6*"
 
 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 which version we need
+	WX_GTK_VER="2.6"
 
 	# Check for proper wxGTK USE flags.
 	if use unicode; then
@@ -27,7 +27,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-20070525.ebuild b/sci-electronics/kicad/kicad-20070525.ebuild
index 1a6cdf552853..a7cb7ef1af22 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.3 2007/06/23 20:12:59 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20070525.ebuild,v 1.4 2007/07/07 08:44:26 calchan Exp $
 
 inherit wxwidgets
 
@@ -15,11 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc examples minimal unicode"
 
-DEPEND=">=x11-libs/wxGTK-2.6"
+DEPEND="=x11-libs/wxGTK-2.6*"
 
 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 which version we need
+	WX_GTK_VER="2.6"
 
 	# Check for proper wxGTK USE flags.
 	if use unicode; then
@@ -27,7 +27,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() {