Depend on guile-gtk 1.2 series only, now that 2.x is out. Also change one >=gtk+-1.2.10 dep to =gtk+-1.2*.

Package-Manager: portage-2.1.3_rc4

4 files changed, 23 insertions, 18 deletions

diff --git a/sci-electronics/gwave/ChangeLog b/sci-electronics/gwave/ChangeLog
index 1f6e3a3d01e8..5a59541e8a92 100644
--- a/sci-electronics/gwave/ChangeLog
+++ b/sci-electronics/gwave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-electronics/gwave
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gwave/ChangeLog,v 1.12 2007/05/06 15:56:43 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gwave/ChangeLog,v 1.13 2007/06/22 22:30:23 dberkholz Exp $
+
+  22 Jun 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  gwave-20031224.ebuild, gwave-20051222.ebuild:
+  Depend on guile-gtk 1.2 series only, now that 2.x is out. Also change one
+  >=gtk+-1.2.10 dep to =gtk+-1.2*.
 
 *gwave-20060606 (06 May 2007)
 
diff --git a/sci-electronics/gwave/Manifest b/sci-electronics/gwave/Manifest
index 7caf3b110038..9f69c12c7556 100644
--- a/sci-electronics/gwave/Manifest
+++ b/sci-electronics/gwave/Manifest
@@ -1,22 +1,22 @@
 DIST gwave-20031224.tar.gz 441342 RMD160 84fb474610c6c62e7d6e63cf133ad55b3a597f41 SHA1 405c0cdaa49ba080e3ed3a6690fe673062898151 SHA256 258282a6e4f83a36c751f5369eba2a86f3ceadde7ac3b05f4e9315e57bbc9abf
 DIST gwave-20051222.tar.gz 479477 RMD160 d9f46d885d2c0e15662046a36cdc114980c48f30 SHA1 51f3d1e9bf85744dcfd48724596d132f2c5d7e97 SHA256 32c9d78f702f0620101a208efc3704c10c9c23be38868463a2db96a49c9344e3
 DIST gwave-20060606.tar.gz 490107 RMD160 67c6e9bb5a001352f627662bd6eb225a78d028e8 SHA1 e335822815ec7580b1e66ac253fe438ef439dfbe SHA256 4e69e31f261cf020b91fe66588ec85b58333adc70a38c7d96ff565b40faca92e
-EBUILD gwave-20031224.ebuild 852 RMD160 d03154cbaf856c7c6813f5380d196bd0a6f4bab4 SHA1 ff1a702e548578790e35a6b04d01a806064ee1b1 SHA256 bacdcaa47ad6eb3f763ab57b543445fadd3bc3f926f7559231c1f4375bc1dd0a
-MD5 d7c9a4240d7f87d1eab15e45e19b3c3e gwave-20031224.ebuild 852
-RMD160 d03154cbaf856c7c6813f5380d196bd0a6f4bab4 gwave-20031224.ebuild 852
-SHA256 bacdcaa47ad6eb3f763ab57b543445fadd3bc3f926f7559231c1f4375bc1dd0a gwave-20031224.ebuild 852
-EBUILD gwave-20051222.ebuild 909 RMD160 de11d6eec34ee4d6b2451e5daec3ab2c293fc874 SHA1 2975332cfd306a7761a3d7028cceb208c4599a58 SHA256 705624fe2bc9a7368180fa90105db28616d9f16c250d3e3293873da06a6ad6af
-MD5 b5c3e75e217decacb65d7b8429cf37e8 gwave-20051222.ebuild 909
-RMD160 de11d6eec34ee4d6b2451e5daec3ab2c293fc874 gwave-20051222.ebuild 909
-SHA256 705624fe2bc9a7368180fa90105db28616d9f16c250d3e3293873da06a6ad6af gwave-20051222.ebuild 909
+EBUILD gwave-20031224.ebuild 846 RMD160 5946b46ceff34f584bf742a36fc49b6339bd8e10 SHA1 9c7d0d76b129168e0f73257f8ebd0816638fcfa5 SHA256 58e94c900079d47e5140eb9531e14641cce2356306ed747f2e99d1bcb0d37004
+MD5 f2e7b4d569f5a5731e668a791bfb281e gwave-20031224.ebuild 846
+RMD160 5946b46ceff34f584bf742a36fc49b6339bd8e10 gwave-20031224.ebuild 846
+SHA256 58e94c900079d47e5140eb9531e14641cce2356306ed747f2e99d1bcb0d37004 gwave-20031224.ebuild 846
+EBUILD gwave-20051222.ebuild 906 RMD160 8b769262217ac1f9f5796892c92b3beca7ca3e7d SHA1 54a79167f759afecd2f4c11af234db0352393443 SHA256 ec76e1af4a9cef80576df6e27d2d10891b552913486272fcdafd5518b8fd6781
+MD5 76ee5d36a64495a30afe096b8068a75a gwave-20051222.ebuild 906
+RMD160 8b769262217ac1f9f5796892c92b3beca7ca3e7d gwave-20051222.ebuild 906
+SHA256 ec76e1af4a9cef80576df6e27d2d10891b552913486272fcdafd5518b8fd6781 gwave-20051222.ebuild 906
 EBUILD gwave-20060606.ebuild 1038 RMD160 2606689f649220101dd5dc97c6ca77aab9258700 SHA1 a87796c0613a4d747e464b52ae1e72c9c598aa0d SHA256 825da81295ecd6ada8eab0ce74a90a680c606b684ab674c85268f04576efff93
 MD5 88ba6086f598df3351684124d99b70e7 gwave-20060606.ebuild 1038
 RMD160 2606689f649220101dd5dc97c6ca77aab9258700 gwave-20060606.ebuild 1038
 SHA256 825da81295ecd6ada8eab0ce74a90a680c606b684ab674c85268f04576efff93 gwave-20060606.ebuild 1038
-MISC ChangeLog 2490 RMD160 9667028f70b1cd2cc67cfb61ca806c517a5df676 SHA1 638ca7bd3417d58f05d5e94d9abb96bcf6c30275 SHA256 e805956fc9359679f723304433b22eb216a6818d2f693d91b2d373ed3fb51123
-MD5 2d0f3e80862efc79d909728b9f32763b ChangeLog 2490
-RMD160 9667028f70b1cd2cc67cfb61ca806c517a5df676 ChangeLog 2490
-SHA256 e805956fc9359679f723304433b22eb216a6818d2f693d91b2d373ed3fb51123 ChangeLog 2490
+MISC ChangeLog 2707 RMD160 1acb738b81bf00093c9a450ec65c023e6a84f106 SHA1 e106972966d452c9dd050e99c84baf91097e5019 SHA256 0084b52535f4895f9ecb09d1fac7010ff378561f627bd853abd84747148afaf3
+MD5 c029868e758ae8ead02456c06ef781c6 ChangeLog 2707
+RMD160 1acb738b81bf00093c9a450ec65c023e6a84f106 ChangeLog 2707
+SHA256 0084b52535f4895f9ecb09d1fac7010ff378561f627bd853abd84747148afaf3 ChangeLog 2707
 MISC metadata.xml 545 RMD160 c5d9c7f4c1c8a7ea1844c1a70642ad39eab0efbe SHA1 21d3e59ddb73fc130d6291069bc7e2509d27d285 SHA256 8780bd44288620adc70b182e7750865f957233b073a3979413d69fa799c55f22
 MD5 652456d5ad8cc441db124a6579c6f687 metadata.xml 545
 RMD160 c5d9c7f4c1c8a7ea1844c1a70642ad39eab0efbe metadata.xml 545
diff --git a/sci-electronics/gwave/gwave-20031224.ebuild b/sci-electronics/gwave/gwave-20031224.ebuild
index b86da795234c..b756523a24c4 100644
--- a/sci-electronics/gwave/gwave-20031224.ebuild
+++ b/sci-electronics/gwave/gwave-20031224.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/gwave/gwave-20031224.ebuild,v 1.7 2007/03/03 13:08:41 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gwave/gwave-20031224.ebuild,v 1.8 2007/06/22 22:30:23 dberkholz Exp $
 
 DESCRIPTION="A waveform viewer analog data, such as SPICE simulations."
 LICENSE="GPL-2"
@@ -11,10 +11,10 @@ KEYWORDS="~amd64 ppc x86"
 IUSE=""
 SLOT="0"
 
-DEPEND=">=x11-libs/gtk+-1.2.10
+DEPEND="=x11-libs/gtk+-1.2*
 	>=dev-scheme/guile-1.6.3
 	<dev-scheme/guile-1.8
-	>=x11-libs/guile-gtk-1.2.0.31"
+	=x11-libs/guile-gtk-1.2*"
 
 src_compile() {
 	econf || die "econf failed"
diff --git a/sci-electronics/gwave/gwave-20051222.ebuild b/sci-electronics/gwave/gwave-20051222.ebuild
index 7fbfe84887be..63f3d4c0ca08 100644
--- a/sci-electronics/gwave/gwave-20051222.ebuild
+++ b/sci-electronics/gwave/gwave-20051222.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/gwave/gwave-20051222.ebuild,v 1.3 2007/03/03 13:08:41 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gwave/gwave-20051222.ebuild,v 1.4 2007/06/22 22:30:23 dberkholz Exp $
 
 inherit flag-o-matic
 
@@ -16,7 +16,7 @@ SLOT="0"
 DEPEND="=x11-libs/gtk+-1.2*
 	>=dev-scheme/guile-1.6.3
 	<dev-scheme/guile-1.8
-	>=x11-libs/guile-gtk-1.2.0.31"
+	=x11-libs/guile-gtk-1.2*"
 
 src_compile() {
 	filter-ldflags -Wl,--as-needed --as-needed