Fixed broken DEPEND. Closing bug #34573.

7 files changed, 84 insertions, 201 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index 1e705a596901..621af42792fb 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2003/11/01 11:31:39 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.20 2003/11/29 16:24:26 usata Exp $
+
+  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
 
   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 37498d351bb8..66fac5ef6e81 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,14 +1,10 @@
-MD5 861136676a84615a8ed56120f5e5b4c0 ChangeLog 2673
+MD5 a5336241b141c9ed31316483f8636760 ChangeLog 3019
 MD5 d714967266da9feec2fdf7dcb7442d31 mlterm-2.5.0-r1.ebuild 1043
-MD5 6c3ff98b0c1d552812bdfb6540d3a4cc mlterm-2.6.2.ebuild 1043
-MD5 59ff1ac790583490234473cfe2eca231 mlterm-2.6.3-r2.ebuild 1265
-MD5 9c532f1ca1a47f58396b97df440f4cc8 mlterm-2.7.0-r1.ebuild 1306
+MD5 efcedaed7bff3f1bea69aed8ab92202f mlterm-2.7.0-r1.ebuild 1333
+MD5 8938ae00b8cd8f37df08245e36a4a57e mlterm-2.6.3-r2.ebuild 1287
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 897160590f87c3f0b5924215e293e55a mlterm-2.8.0_p1.ebuild 1516
-MD5 75486e594e8d84e9a89eede0d5efe3d6 mlterm-2.8.0_p1-r1.ebuild 1578
+MD5 15f70c707527c3822cfc6c75862d0562 mlterm-2.8.0_p1-r1.ebuild 1595
 MD5 8ae11eea8e60c50e9427891bbbcd136f files/digest-mlterm-2.5.0-r1 65
-MD5 eec1ca22e9d39b3795fa8dc08e948167 files/digest-mlterm-2.6.2 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 129
 MD5 a0803ba46dc61092ab4aed1119efee8c files/digest-mlterm-2.8.0_p1-r1 129
diff --git a/x11-terms/mlterm/mlterm-2.6.2.ebuild b/x11-terms/mlterm/mlterm-2.6.2.ebuild
deleted file mode 100644
index 8010da1c752e..000000000000
--- a/x11-terms/mlterm/mlterm-2.6.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.2.ebuild,v 1.2 2003/02/13 17:35:28 vapier Exp $
-
-IUSE="truetype gtk gnome imlib"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-LICENSE="BSD"
-
-DEPEND="virtual/x11
-	imlib?    ( >=media-libs/imlib-1.9.14 )
-	gtk?      ( >=x11-libs/gtk+-1.2.10 )
-	gnome?    ( >=media-libs/gdk-pixbuf-0.18.0 )
-	truetype? ( >=media-libs/freetype-2.1.2 )"
-
-
-src_compile() {
-	local myconf
-
-	use imlib \
-		&& myconf="${myconf} --enable-imlib"
-
-	use gnome \
-		&& myconf="${myconf} --enable-gdk-pixbuf"
-
-	use truetype \
-		&& myconf="${myconf} --enable-anti-alias"
-
-	myconf="${myconf} --enable-utmp"
-
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog LICENCE README
-}
diff --git a/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild b/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild
index 73f06e6d4e43..2e1e6af18584 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.2 2003/11/01 11:31:39 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild,v 1.3 2003/11/29 16:24:26 usata Exp $
 
-IUSE="truetype gtk gtk2 gnome imlib nls"
+IUSE="truetype gnome gtk gtk2 imlib bidi nls"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A multi-lingual terminal emulator"
@@ -13,35 +13,33 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 LICENSE="BSD"
 
-DEPEND="virtual/x11
-	gtk?      ( =x11-libs/gtk+-1.2* )
-	gtk2?     ( >=x11-libs/gtk+-2.0.8 )
-	!gtk2? ( imlib? ( >=media-libs/imlib-1.9.14 )
-			 gnome? ( >=media-libs/gdk-pixbuf-0.18.0 ) )
+DEPEND="gnome? ( gtk? ( gtk2? ( =x11-libs/gtk+-2* ) ) :
+			( >=media-libs/gdk-pixbuf-0.18.0 ) )
+	!gnome? ( imlib? >=media-libs/imlib-1.9.14 : virtual/x11 )
+	=x11-libs/gtk+-1.2*
 	truetype? ( >=media-libs/freetype-2.1.2 )
-	nls?      ( >=dev-libs/fribidi-0.10.4 )"
+	bidi? ( >=dev-libs/fribidi-0.10.4 )
+	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-
-	use gtk2 \
-		&& myconf="${myconf} --with-imagelib=gdk-pixbuf2"
-
-	use imlib \
-		&& myconf="${myconf} --with-imagelib=imlib"
-
-	use gnome \
-		&& myconf="${myconf} --with-imagelib=gdk-pixbuf1"
-
-	use truetype \
-		&& myconf="${myconf} --enable-anti-alias"
-
-	use nls \
-		&& myconf="${myconf} --enable-fribidi"
-
-	myconf="${myconf} --enable-utmp"
-
-	econf ${myconf} || die "./configure failed"
+	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
+	elif [ -n "`use imlib`" ] ; then
+		imagelib="imlib"
+	fi
+
+	econf --enable-utmp \
+		`use_enable truetype anti-alias` \
+		`use_enable bidi fribidi` \
+		`use_enable nls`
+		--with-imagelib=${imagelib} \
+		${myconf} || die "econf failed"
 	emake || die
 }
 
diff --git a/x11-terms/mlterm/mlterm-2.7.0-r1.ebuild b/x11-terms/mlterm/mlterm-2.7.0-r1.ebuild
index 4e2106ede5f2..4cbebaf5662c 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.2 2003/07/05 16:36:52 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.7.0-r1.ebuild,v 1.3 2003/11/29 16:24:26 usata Exp $
 
-IUSE="truetype gtk gtk2 gnome imlib"
+IUSE="truetype gnome gtk gtk2 imlib bidi nls"
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A multi-lingual terminal emulator"
@@ -13,35 +13,33 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 LICENSE="BSD"
 
-DEPEND="virtual/x11
-	gtk?      ( =x11-libs/gtk+-1.2* )
-	gtk2?     ( >=x11-libs/gtk+-2.0.8 )
-	!gtk2? ( imlib? ( >=media-libs/imlib-1.9.14 )
-			 gnome? ( >=media-libs/gdk-pixbuf-0.18.0 ) )
+DEPEND="gnome? ( gtk? ( gtk2? ( =x11-libs/gtk+-2* ) ) :
+			( >=media-libs/gdk-pixbuf-0.18.0 ) )
+	!gnome? ( imlib? >=media-libs/imlib-1.9.14 : virtual/x11 )
+	=x11-libs/gtk+-1.2*
 	truetype? ( >=media-libs/freetype-2.1.2 )
-	nls?      ( >=dev-libs/fribidi-0.10.4 )"
+	bidi? ( >=dev-libs/fribidi-0.10.4 )
+	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-
-	use gtk2 \
-		&& myconf="${myconf} --with-imagelib=gdk-pixbuf2"
-
-	use imlib \
-		&& myconf="${myconf} --with-imagelib=imlib"
-
-	use gnome \
-		&& myconf="${myconf} --with-imagelib=gdk-pixbuf1"
-
-	use truetype \
-		&& myconf="${myconf} --enable-anti-alias"
-
-	use nls \
-		&& myconf="${myconf} --enable-fribidi"
-
-	myconf="${myconf} --enable-utmp"
-
-	econf ${myconf} || die "./configure failed"
+	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
+	elif [ -n "`use imlib`" ] ; then
+		imagelib="imlib"
+	fi
+
+	econf --enable-utmp \
+		`use_enable truetype anti-alias` \
+		`use_enable bidi fribidi` \
+		`use_enable nls` \
+		--with-imagelib=${imagelib} \
+		${myconf} || die "econf failed"
 	emake || die
 }
 
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 1e09574edbb7..e47e8b73a8b6 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.1 2003/10/27 17:53:47 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.8.0_p1-r1.ebuild,v 1.2 2003/11/29 16:24:26 usata Exp $
 
-IUSE="truetype gtk gtk2 nls imlib nopixbuf bidi"
+IUSE="truetype gnome gtk gtk2 imlib bidi nls"
 
 MY_P="${P/_p?/}"
 PATCH_P="${P/_p/pl}"
@@ -17,17 +17,13 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 LICENSE="BSD"
 
-DEPEND="virtual/x11
-	gtk? ( =x11-libs/gtk+-1.2*
-		nls? ( sys-devel/gettext ) )
-	|| (
-		!nopixbuf? ( media-libs/gdk-pixbuf )
-		imlib? ( media-libs/imlib )
-		gtk2? ( =x11-libs/gtk+-2* )
-		virtual/x11
-	)
+DEPEND="gnome? ( gtk? ( gtk2? ( =x11-libs/gtk+-2* ) ) :
+			( >=media-libs/gdk-pixbuf-0.18.0 ) )
+	!gnome? ( imlib? >=media-libs/imlib-1.9.14 : virtual/x11 )
+	gtk? ( =x11-libs/gtk+-1.2* )
 	truetype? ( =media-libs/freetype-2* )
-	bidi? ( dev-libs/fribidi )"
+	bidi? ( >=dev-libs/fribidi-0.10.4 )
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
@@ -36,25 +32,25 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=""
+	local myconf imagelib
 
-	if [ ! `use nopixbuf` ] ; then
-		myconf="--with-imagelib=gdk-pixbuf1"
-	elif [ `use imlib` ] ; then
-		myconf="--with-imagelib=imlib"
-	elif [ `use gtk2` ] ; then
-		myconf="--with-imagelib=gdk-pixbuf2"
-	else
-		myconf="--with-imagelib="
+	if [ -n "`use gnome`" ] ; then
+		if [ -n "`use gtk`" -a -n "`use gtk2`" ] ; then
+			imagelib="gdk-pixbuf2"
+		else
+			imagelib="gdk-pixbuf1"
+		fi
+	elif [ -n "`use imlib`" ] ; then
+		imagelib="imlib"
 	fi
 
 	use gtk || myconf="${myconf} --with-tools=mlclient,mlcc"
 
-	econf \
+	econf --enable-utmp \
 		`use_enable truetype anti-alias` \
-		`use_enable nls` \
 		`use_enable bidi fribidi` \
-		--enable-utmp \
+		`use_enable nls` \
+		--with-imagelib=${imagelib} \
 		${myconf} || die "econf failed"
 	emake || die "emake failed"
 }
diff --git a/x11-terms/mlterm/mlterm-2.8.0_p1.ebuild b/x11-terms/mlterm/mlterm-2.8.0_p1.ebuild
deleted file mode 100644
index d876759f33c7..000000000000
--- a/x11-terms/mlterm/mlterm-2.8.0_p1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.ebuild,v 1.2 2003/10/27 05:48:32 nakano Exp $
-
-IUSE="truetype gtk gtk2 nls imlib nopixbuf bidi"
-
-MY_P="${P/_p?/}"
-PATCH_P="${P/_p/pl}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlterm/${MY_P}.tar.gz
-	mirror://sourceforge/mlterm/${PATCH_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="x86 ppc"
-LICENSE="BSD"
-
-DEPEND="virtual/x11
-	gtk? ( =x11-libs/gtk+-1.2*
-		nls? ( sys-devel/gettext ) )
-	|| (
-		!nopixbuf? ( media-libs/gdk-pixbuf )
-		imlib? ( media-libs/imlib )
-		gtk2? ( =x11-libs/gtk+-2* )
-		virtual/x11
-	)
-	truetype? ( =media-libs/freetype-2* )
-	bidi? ( dev-libs/fribidi )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${PATCH_P}/${PATCH_P}.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	if [ ! `use nopixbuf` ] ; then
-		myconf="--with-imagelib=gdk-pixbuf1"
-	elif [ `use imlib` ] ; then
-		myconf="--with-imagelib=imlib"
-	elif [ `use gtk2` ] ; then
-		myconf="--with-imagelib=gdk-pixbuf2"
-	else
-		myconf="--with-imagelib="
-	fi
-
-	use gtk || myconf="${myconf} --with-tools=mlclient,mlcc"
-
-	econf \
-		`use_enable truetype anti-alias` \
-		`use_enable nls` \
-		`use_enable bidi fribidi` \
-		--enable-utmp \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	einstall || die
-
-	dodoc ChangeLog LICENCE README
-}