fixed DEPEND to use compiled in version of gtk+, not a choice set by USE flag

5 files changed, 16 insertions, 15 deletions

diff --git a/net-www/phoenix-bin/ChangeLog b/net-www/phoenix-bin/ChangeLog
index 758dbc4f6eb5..4f1620f61088 100644
--- a/net-www/phoenix-bin/ChangeLog
+++ b/net-www/phoenix-bin/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-www/phoenix-bin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/ChangeLog,v 1.22 2003/05/12 22:32:01 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/ChangeLog,v 1.23 2003/05/12 22:54:48 george Exp $
 
   11 May 2003; George Shapovalov <george@gentoo.org> phoenix-bin-0.5-r1.ebuild :
   added announcement of move to pkg_postinst per killian's request
+  corrected DEPEND to use =x11-libs/gtk+-1.2* strictly (it's already 
+  compiled! What was the deal?)
+  see #20809, thanks to Stuart Still <stustill@hotmail.com> for spotting this
 
 *phoenix-bin-0.5-r1 (09 May 2003)
 
diff --git a/net-www/phoenix-bin/phoenix-bin-0.4-r1.ebuild b/net-www/phoenix-bin/phoenix-bin-0.4-r1.ebuild
index 7fd803e1a9e4..9f2585ee5eb9 100644
--- a/net-www/phoenix-bin/phoenix-bin-0.4-r1.ebuild
+++ b/net-www/phoenix-bin/phoenix-bin-0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/phoenix-bin-0.4-r1.ebuild,v 1.4 2003/02/13 15:42:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/phoenix-bin-0.4-r1.ebuild,v 1.5 2003/05/12 22:54:48 george Exp $
 
 IUSE=""
 
@@ -17,7 +17,7 @@ LICENSE="MPL-1.1 NPL-1.1"
 
 DEPEND="virtual/glibc"
 RDEPEND=">=sys-libs/lib-compat-1.0-r2
-	 >=x11-libs/gtk+-1.2.10-r9
+	 =x11-libs/gtk+-1.2*
 	 virtual/x11"
 
 src_install() {
diff --git a/net-www/phoenix-bin/phoenix-bin-0.4-r2.ebuild b/net-www/phoenix-bin/phoenix-bin-0.4-r2.ebuild
index aea97b484772..d28b6976eadc 100644
--- a/net-www/phoenix-bin/phoenix-bin-0.4-r2.ebuild
+++ b/net-www/phoenix-bin/phoenix-bin-0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/phoenix-bin-0.4-r2.ebuild,v 1.6 2003/02/13 15:42:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/phoenix-bin-0.4-r2.ebuild,v 1.7 2003/05/12 22:54:48 george Exp $
 
 MY_PN=${PN/-bin/}
 S=${WORKDIR}/${MY_PN}
@@ -15,7 +15,7 @@ LICENSE="MPL-1.1 NPL-1.1"
 
 DEPEND="virtual/glibc"
 RDEPEND=">=sys-libs/lib-compat-1.0-r2
-	 >=x11-libs/gtk+-1.2.10-r9
+	 =x11-libs/gtk+-1.2*
 	 virtual/x11"
 
 src_install() {
diff --git a/net-www/phoenix-bin/phoenix-bin-0.5-r1.ebuild b/net-www/phoenix-bin/phoenix-bin-0.5-r1.ebuild
index a215a054c8cf..54fb311f95a3 100644
--- a/net-www/phoenix-bin/phoenix-bin-0.5-r1.ebuild
+++ b/net-www/phoenix-bin/phoenix-bin-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/phoenix-bin-0.5-r1.ebuild,v 1.2 2003/05/12 22:32:01 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/phoenix-bin-0.5-r1.ebuild,v 1.3 2003/05/12 22:54:48 george Exp $
 
 IUSE=""
 
@@ -17,10 +17,9 @@ LICENSE="MPL-1.1 NPL-1.1"
 
 DEPEND="virtual/glibc"
 RDEPEND=">=sys-libs/lib-compat-1.0-r2
-	( gtk2? >=x11-libs/gtk+-2.0.8 :
-			=x11-libs/gtk+-1.2* )
-	 virtual/x11
-	 !net-www/phoenix-cvs"
+	=x11-libs/gtk+-1.2*
+	virtual/x11
+	!net-www/phoenix-cvs"
 
 src_install() {
 	# Plugin path creation
diff --git a/net-www/phoenix-bin/phoenix-bin-0.5.ebuild b/net-www/phoenix-bin/phoenix-bin-0.5.ebuild
index 26b85213c4fd..ae37e8b52aa8 100644
--- a/net-www/phoenix-bin/phoenix-bin-0.5.ebuild
+++ b/net-www/phoenix-bin/phoenix-bin-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/phoenix-bin-0.5.ebuild,v 1.6 2003/03/30 09:27:00 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phoenix-bin/phoenix-bin-0.5.ebuild,v 1.7 2003/05/12 22:54:48 george Exp $
 
 IUSE=""
 
@@ -17,10 +17,9 @@ LICENSE="MPL-1.1 NPL-1.1"
 
 DEPEND="virtual/glibc"
 RDEPEND=">=sys-libs/lib-compat-1.0-r2
-	( gtk2? >=x11-libs/gtk+-2.0.8 :
-			=x11-libs/gtk+-1.2* )
-	 virtual/x11
-	 !net-www/phoenix-cvs"
+	=x11-libs/gtk+-1.2*
+	virtual/x11
+	!net-www/phoenix-cvs"
 
 src_install() {
 	# Plugin path creation