Updated CVS snapshot and added uim IUSE flag. Removed old ebuilds.

7 files changed, 19 insertions, 76 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index fb6a441bf63b..758f883965cc 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/mlterm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.26 2004/03/10 18:31:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.27 2004/04/25 15:32:47 usata Exp $
+
+*mlterm-2.8.1_pre20040423 (26 Apr 2004)
+
+  26 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> mlterm-2.7.0-r1.ebuild,
+  mlterm-2.8.1_pre20040203.ebuild, mlterm-2.8.1_pre20040423.ebuild:
+  Updated CVS snapshot. Added uim IUSE flag. Removed old ebuilds.
 
 *mlterm-2.8.1_pre20040310 (11 Mar 2004)
 
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 6ab30dec502c..6490245d790a 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,10 +1,8 @@
-MD5 04c0c98393d882d39652b34a0f640193 mlterm-2.7.0-r1.ebuild 1578
 MD5 1647004e2d2b4483196f37d2bfd92941 mlterm-2.8.0_p1-r1.ebuild 1836
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 ca92eb9de328350bf49bc3ddf9069392 mlterm-2.8.1_pre20040203.ebuild 1653
 MD5 c829c0091da721af4ebee2f8fb05228a mlterm-2.8.1_pre20040310.ebuild 1210
-MD5 727cbf1c4da2cb5105b8b1bf42e81a37 ChangeLog 3434
+MD5 1a480ae53f0b351bfeb7af4089878afa ChangeLog 3683
+MD5 30e875ed02d54a15df39a41fd484ec0a mlterm-2.8.1_pre20040423.ebuild 1268
 MD5 a0803ba46dc61092ab4aed1119efee8c files/digest-mlterm-2.8.0_p1-r1 129
-MD5 61b653fe840ef82968a2bb425dbbdaf5 files/digest-mlterm-2.7.0-r1 65
 MD5 d0bd3f4adf9a70c4b5bab4f0b00c86ef files/digest-mlterm-2.8.1_pre20040310 68
-MD5 2e100b66a4693f0f38ab5e1ad658260f files/digest-mlterm-2.8.1_pre20040203 68
+MD5 9ee6cb0d32f6c0caa9b02c11020f50ad files/digest-mlterm-2.8.1_pre20040423 68
diff --git a/x11-terms/mlterm/files/digest-mlterm-2.7.0-r1 b/x11-terms/mlterm/files/digest-mlterm-2.7.0-r1
deleted file mode 100644
index bf1c29ab14ba..000000000000
--- a/x11-terms/mlterm/files/digest-mlterm-2.7.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03d6cf243ada71e3b80553a9a4a8a372 mlterm-2.7.0.tar.gz 1743950
diff --git a/x11-terms/mlterm/files/digest-mlterm-2.8.1_pre20040203 b/x11-terms/mlterm/files/digest-mlterm-2.8.1_pre20040203
deleted file mode 100644
index 977a08e23dc9..000000000000
--- a/x11-terms/mlterm/files/digest-mlterm-2.8.1_pre20040203
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b08fa3fcf8f87488430a5d1f1a9966f9 mlterm-20040203.tar.gz 1852115
diff --git a/x11-terms/mlterm/files/digest-mlterm-2.8.1_pre20040423 b/x11-terms/mlterm/files/digest-mlterm-2.8.1_pre20040423
new file mode 100644
index 000000000000..47765e0be5f3
--- /dev/null
+++ b/x11-terms/mlterm/files/digest-mlterm-2.8.1_pre20040423
@@ -0,0 +1 @@
+MD5 5fd94f0db7307ac1239abaaa0ee21fd5 mlterm-20040423.tar.gz 1855050
diff --git a/x11-terms/mlterm/mlterm-2.7.0-r1.ebuild b/x11-terms/mlterm/mlterm-2.7.0-r1.ebuild
deleted file mode 100644
index 2b3e32c9d595..000000000000
--- a/x11-terms/mlterm/mlterm-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,53 +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.7.0-r1.ebuild,v 1.5 2003/12/07 14:22:21 usata Exp $
-
-IUSE="truetype gtk gtk2 imlib bidi nls"
-
-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"
-
-# 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 )
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf imagelib
-
-	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
-
-	econf --enable-utmp \
-		`use_enable truetype anti-alias` \
-		`use_enable bidi fribidi` \
-		`use_enable nls` \
-		--with-imagelib=${imagelib} \
-		${myconf} || die "econf failed"
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	dodoc ChangeLog LICENCE README
-	insinto /etc/mlterm ; doins contrib/tool/mlterm-menu/menu
-}
diff --git a/x11-terms/mlterm/mlterm-2.8.1_pre20040203.ebuild b/x11-terms/mlterm/mlterm-2.8.1_pre20040423.ebuild
index 6c7ab3b74dbe..1104675c4871 100644
--- a/x11-terms/mlterm/mlterm-2.8.1_pre20040203.ebuild
+++ b/x11-terms/mlterm/mlterm-2.8.1_pre20040423.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.1_pre20040203.ebuild,v 1.1 2004/02/03 13:17:48 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.8.1_pre20040423.ebuild,v 1.1 2004/04/25 15:32:47 usata Exp $
 
-IUSE="truetype gtk gtk2 imlib bidi nls"
+IUSE="truetype gtk imlib bidi nls uim"
 
 S="${WORKDIR}/${PN}"
 
@@ -14,26 +14,18 @@ SLOT="0"
 KEYWORDS="~x86"
 LICENSE="BSD"
 
-# 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* )
+DEPEND="gtk? ( >=x11-libs/gtk+-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 )"
+	nls? ( sys-devel/gettext )
+	uim? ( >=app-i18n/uim-0.3.4.2 )"
 
 src_compile() {
 	local myconf imagelib
 
-	if [ -n "`use gtk`" -a -n "`use gtk2`" ] ; then
-		imagelib="gdk-pixbuf2"
-	elif [ -n "`use gtk`" ] ; then
-		imagelib="gdk-pixbuf1"
+	if [ -n "`use gtk`" ] ; then
+		imagelib="gdk-pixbuf"
 	elif [ -n "`use imlib`" ] ; then
 		imagelib="imlib"
 	fi
@@ -44,6 +36,7 @@ src_compile() {
 		`use_enable truetype anti-alias` \
 		`use_enable bidi fribidi` \
 		`use_enable nls` \
+		`use_enable uim` \
 		--with-imagelib=${imagelib} \
 		${myconf} || die "econf failed"
 	emake || die "emake failed"