Clarified DEPEND. Thanks to Spider, see also bug 34573

5 files changed, 54 insertions, 51 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index b99d68b0f520..a059e7379c62 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,17 +1,11 @@
 # ChangeLog for x11-terms/mlterm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.22 2003/12/05 08:15:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.23 2003/12/07 14:22:21 usata Exp $
 
-  05 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> mlterm-2.6.3-r2.ebuild,
+  07 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> mlterm-2.6.3-r2.ebuild,
   mlterm-2.7.0-r1.ebuild, mlterm-2.8.0_p1-r1.ebuild:
-  Removed deprecated : operator.
-
-  30 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> mlterm-2.6.3-r2.ebuild,
-  mlterm-2.7.0-r1.ebuild, mlterm-2.8.0_p1-r1.ebuild:
-  Corrected DEPEND. Removed nopixbuf IUSE flag. (mlterm uses either
-  imlib, gdk-pixbuf1 or gdk-pixbuf2, so there's no good reason for
-  associating nopixbuf with gdk-pixbuf1 and making it default)
-  Closing bug #34573
+  Corrected DEPEND. Thanks to spider@gentoo.org, see comments in ebuilds
+  and bug #34573
 
   01 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> mlterm-2.6.3-r1.ebuild,
   mlterm-2.6.3-r2.ebuild, mlterm-2.6.3.ebuild, mlterm-2.7.0.ebuild,
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 4722c267b86e..200b624e6e62 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,10 +1,10 @@
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 9f7e243896bb6b28875e5631eef3e3cd mlterm-2.7.0-r1.ebuild 1327
-MD5 0b4bd387619ab80fbd6ddb3116fb3557 ChangeLog 3275
-MD5 b09da0a9bc034eb4aff60fd76153de71 mlterm-2.8.0_p1-r1.ebuild 1587
-MD5 77f8d109d42a5884ae6a70fcd471ce02 mlterm-2.6.3-r2.ebuild 1281
+MD5 7d3a5c6077e4ba0ce7ab853b0a82d5a0 ChangeLog 2986
 MD5 d714967266da9feec2fdf7dcb7442d31 mlterm-2.5.0-r1.ebuild 1043
-MD5 61b653fe840ef82968a2bb425dbbdaf5 files/digest-mlterm-2.7.0-r1 65
-MD5 a0803ba46dc61092ab4aed1119efee8c files/digest-mlterm-2.8.0_p1-r1 129
+MD5 04c0c98393d882d39652b34a0f640193 mlterm-2.7.0-r1.ebuild 1578
+MD5 b3fcd77a40f434cbe1ffd29c81b3c08e mlterm-2.6.3-r2.ebuild 1532
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 931480c8f179e63046a208677b2c0e39 mlterm-2.8.0_p1-r1.ebuild 1830
 MD5 8ae11eea8e60c50e9427891bbbcd136f files/digest-mlterm-2.5.0-r1 65
 MD5 2eb5c2051e8917a0ee06e9902dcf2e16 files/digest-mlterm-2.6.3-r2 65
+MD5 61b653fe840ef82968a2bb425dbbdaf5 files/digest-mlterm-2.7.0-r1 65
+MD5 a0803ba46dc61092ab4aed1119efee8c files/digest-mlterm-2.8.0_p1-r1 129
diff --git a/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild b/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild
index 1d9215668041..4dc8be924ece 100644
--- a/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild
+++ b/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild,v 1.4 2003/12/05 08:15:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild,v 1.5 2003/12/07 14:22:21 usata Exp $
 
-IUSE="truetype gnome gtk gtk2 imlib bidi nls"
+IUSE="truetype gtk gtk2 imlib bidi nls"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A multi-lingual terminal emulator"
@@ -13,9 +13,14 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 LICENSE="BSD"
 
-DEPEND="gnome? ( gtk? ( gtk2? ( =x11-libs/gtk+-2* ) ) 
-		!gtk? ( >=media-libs/gdk-pixbuf-0.18.0 ) )
-	!gnome? ( imlib? ( >=media-libs/imlib-1.9.14 ) )
+# mlterm itself could use either gdk-pixbuf2, gdk-pixbuf1 or imlib but
+# mlconfig requires gtk+-1.2. Hence, I leave gtk+-1.2 inside gtk? clause
+# even though you have gtk2 USE flag. (If you build mlterm with
+# gdk-pixbuf2 mlterm won't depend on gtk+-1.2 but mlconfig does)
+# See also bug 34573
+DEPEND="gtk? ( gtk2? ( >=x11-libs/gtk+-2 )
+		!gtk2? ( media-libs/gdk-pixbuf ) )
+	!gtk? ( imlib? ( >=media-libs/imlib-1.9.14 ) )
 	=x11-libs/gtk+-1.2*
 	truetype? ( >=media-libs/freetype-2.1.2 )
 	bidi? ( >=dev-libs/fribidi-0.10.4 )
@@ -24,12 +29,10 @@ DEPEND="gnome? ( gtk? ( gtk2? ( =x11-libs/gtk+-2* ) )
 src_compile() {
 	local myconf imagelib
 
-	if [ -n "`use gnome`" ] ; then
-		if [ -n "`use gtk`" -a -n "`use gtk2`" ] ; then
-			imagelib="gdk-pixbuf2"
-		else
-			imagelib="gdk-pixbuf1"
-		fi
+	if [ -n "`use gtk`" -a -n "`use gtk2`" ] ; then
+		imagelib="gdk-pixbuf2"
+	elif [ -n "`use gtk`" ] ; then
+		imagelib="gdk-pixbuf1"
 	elif [ -n "`use imlib`" ] ; then
 		imagelib="imlib"
 	fi
diff --git a/x11-terms/mlterm/mlterm-2.7.0-r1.ebuild b/x11-terms/mlterm/mlterm-2.7.0-r1.ebuild
index b54f0502aa04..2b3e32c9d595 100644
--- a/x11-terms/mlterm/mlterm-2.7.0-r1.ebuild
+++ b/x11-terms/mlterm/mlterm-2.7.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.7.0-r1.ebuild,v 1.4 2003/12/05 08:15:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.7.0-r1.ebuild,v 1.5 2003/12/07 14:22:21 usata Exp $
 
-IUSE="truetype gnome gtk gtk2 imlib bidi nls"
+IUSE="truetype gtk gtk2 imlib bidi nls"
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A multi-lingual terminal emulator"
@@ -13,9 +13,14 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 LICENSE="BSD"
 
-DEPEND="gnome? ( gtk? ( gtk2? ( =x11-libs/gtk+-2* ) ) 
-		!gtk? ( >=media-libs/gdk-pixbuf-0.18.0 ) )
-	!gnome? ( imlib? ( >=media-libs/imlib-1.9.14 ) )
+# mlterm itself could use either gdk-pixbuf2, gdk-pixbuf1 or imlib but
+# mlconfig requires gtk+-1.2. Hence, I leave gtk+-1.2 inside gtk? clause
+# even though you have gtk2 USE flag. (If you build mlterm with
+# gdk-pixbuf2 mlterm won't depend on gtk+-1.2 but mlconfig does)
+# See also bug 34573
+DEPEND="gtk? ( gtk2? ( >=x11-libs/gtk+-2 )
+		!gtk2? ( media-libs/gdk-pixbuf ) )
+	!gtk? ( imlib? ( >=media-libs/imlib-1.9.14 ) )
 	=x11-libs/gtk+-1.2*
 	truetype? ( >=media-libs/freetype-2.1.2 )
 	bidi? ( >=dev-libs/fribidi-0.10.4 )
@@ -24,12 +29,10 @@ DEPEND="gnome? ( gtk? ( gtk2? ( =x11-libs/gtk+-2* ) )
 src_compile() {
 	local myconf imagelib
 
-	if [ -n "`use gnome`" ] ; then
-		if [ -n "`use gtk`" -a -n "`use gtk2`" ] ; then
-			imagelib="gdk-pixbuf2"
-		else
-			imagelib="gdk-pixbuf1"
-		fi
+	if [ -n "`use gtk`" -a -n "`use gtk2`" ] ; then
+		imagelib="gdk-pixbuf2"
+	elif [ -n "`use gtk`" ] ; then
+		imagelib="gdk-pixbuf1"
 	elif [ -n "`use imlib`" ] ; then
 		imagelib="imlib"
 	fi
diff --git a/x11-terms/mlterm/mlterm-2.8.0_p1-r1.ebuild b/x11-terms/mlterm/mlterm-2.8.0_p1-r1.ebuild
index 4b33a8c7d997..b15ae75f069c 100644
--- a/x11-terms/mlterm/mlterm-2.8.0_p1-r1.ebuild
+++ b/x11-terms/mlterm/mlterm-2.8.0_p1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.8.0_p1-r1.ebuild,v 1.4 2003/12/05 08:15:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.8.0_p1-r1.ebuild,v 1.5 2003/12/07 14:22:21 usata Exp $
 
-IUSE="truetype gnome gtk gtk2 imlib bidi nls"
+IUSE="truetype gtk gtk2 imlib bidi nls"
 
 MY_P="${P/_p?/}"
 PATCH_P="${P/_p/pl}"
@@ -17,10 +17,15 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 LICENSE="BSD"
 
-DEPEND="gnome? ( gtk? ( gtk2? ( =x11-libs/gtk+-2* ) ) 
-		!gtk? ( >=media-libs/gdk-pixbuf-0.18.0 ) )
-	!gnome? ( imlib? ( >=media-libs/imlib-1.9.14 ) )
-	gtk? ( =x11-libs/gtk+-1.2* )
+# mlterm itself could use either gdk-pixbuf2, gdk-pixbuf1 or imlib but
+# mlconfig requires gtk+-1.2. Hence, I leave gtk+-1.2 inside gtk? clause
+# even though you have gtk2 USE flag. (If you build mlterm with
+# gdk-pixbuf2 mlterm won't depend on gtk+-1.2 but mlconfig does)
+# See also bug 34573
+DEPEND="gtk? ( gtk2? ( >=x11-libs/gtk+-2 )
+		!gtk2? ( media-libs/gdk-pixbuf )
+		=x11-libs/gtk+-1.2* )
+	!gtk? ( imlib? ( >=media-libs/imlib-1.9.14 ) )
 	truetype? ( =media-libs/freetype-2* )
 	bidi? ( >=dev-libs/fribidi-0.10.4 )
 	nls? ( sys-devel/gettext )"
@@ -34,12 +39,10 @@ src_unpack() {
 src_compile() {
 	local myconf imagelib
 
-	if [ -n "`use gnome`" ] ; then
-		if [ -n "`use gtk`" -a -n "`use gtk2`" ] ; then
-			imagelib="gdk-pixbuf2"
-		else
-			imagelib="gdk-pixbuf1"
-		fi
+	if [ -n "`use gtk`" -a -n "`use gtk2`" ] ; then
+		imagelib="gdk-pixbuf2"
+	elif [ -n "`use gtk`" ] ; then
+		imagelib="gdk-pixbuf1"
 	elif [ -n "`use imlib`" ] ; then
 		imagelib="imlib"
 	fi