New CVS snapshot. Now we can remove GTK+ 1 dependency from mlconfig.

6 files changed, 67 insertions, 58 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index 8a5dac2bce8e..fb6a441bf63b 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.25 2004/02/26 11:44:20 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.26 2004/03/10 18:31:00 usata Exp $
+
+*mlterm-2.8.1_pre20040310 (11 Mar 2004)
+
+  11 Mar 2004; Mamoru KOMACHI <usata@gentoo.org>
+  mlterm-2.8.1_pre20040310.ebuild:
+  New CVS snapshot. Now we can remove GTK+ 1 dependency from mlconfig.
 
   26 Feb 2004; Guy Martin <gmsoft@gentoo.org> mlterm-2.8.0_p1-r1.ebuild:
   Marked stable on hppa.
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 52f67a50f31a..cf4ce47e5840 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,10 +1,13 @@
-MD5 82e9ac309e6949345694263d1cafc6bb ChangeLog 3238
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 b3fcd77a40f434cbe1ffd29c81b3c08e mlterm-2.6.3-r2.ebuild 1532
 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 05651b5e7e57edf5fc52318b33c2e987 ChangeLog.bak 3421
 MD5 ca92eb9de328350bf49bc3ddf9069392 mlterm-2.8.1_pre20040203.ebuild 1653
+MD5 5e99fdea5c98e234663943967c35361b mlterm-2.8.1_pre20040310.ebuild 1210
+MD5 b3fcd77a40f434cbe1ffd29c81b3c08e mlterm-2.6.3-r2.ebuild 1532
+MD5 82e9ac309e6949345694263d1cafc6bb ChangeLog 3238
+MD5 a0803ba46dc61092ab4aed1119efee8c files/digest-mlterm-2.8.0_p1-r1 129
 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
+MD5 d0bd3f4adf9a70c4b5bab4f0b00c86ef files/digest-mlterm-2.8.1_pre20040310 68
 MD5 2e100b66a4693f0f38ab5e1ad658260f files/digest-mlterm-2.8.1_pre20040203 68
diff --git a/x11-terms/mlterm/files/digest-mlterm-2.6.3-r2 b/x11-terms/mlterm/files/digest-mlterm-2.6.3-r2
deleted file mode 100644
index 1213135824be..000000000000
--- a/x11-terms/mlterm/files/digest-mlterm-2.6.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c0dc67e8a12d07f992226fe130881f6 mlterm-2.6.3.tar.gz 1669131
diff --git a/x11-terms/mlterm/files/digest-mlterm-2.8.1_pre20040310 b/x11-terms/mlterm/files/digest-mlterm-2.8.1_pre20040310
new file mode 100644
index 000000000000..4ebbdd0248ee
--- /dev/null
+++ b/x11-terms/mlterm/files/digest-mlterm-2.8.1_pre20040310
@@ -0,0 +1 @@
+MD5 b608b64f7b9b657d41534c43e1538089 mlterm-20040310.tar.gz 1858612
diff --git a/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild b/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild
deleted file mode 100644
index 4dc8be924ece..000000000000
--- a/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild
+++ /dev/null
@@ -1,52 +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.3-r2.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 () {
-	make DESTDIR=${D} install || die
-	dodoc ChangeLog LICENCE README
-}
diff --git a/x11-terms/mlterm/mlterm-2.8.1_pre20040310.ebuild b/x11-terms/mlterm/mlterm-2.8.1_pre20040310.ebuild
new file mode 100644
index 000000000000..5d26bd609e9a
--- /dev/null
+++ b/x11-terms/mlterm/mlterm-2.8.1_pre20040310.ebuild
@@ -0,0 +1,52 @@
+# 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_pre20040310.ebuild,v 1.1 2004/03/10 18:31:00 usata Exp $
+
+IUSE="truetype gtk imlib bidi nls"
+
+S="${WORKDIR}/${PN}"
+
+DESCRIPTION="A multi-lingual terminal emulator"
+HOMEPAGE="http://mlterm.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P/-*_pre/-}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~x86"
+LICENSE="BSD"
+
+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 )"
+
+src_compile() {
+	local myconf imagelib
+
+	if [ -n "`use gtk`" ] ; then
+		imagelib="gdk-pixbuf"
+	elif [ -n "`use imlib`" ] ; then
+		imagelib="imlib"
+	fi
+
+	use gtk || myconf="${myconf} --with-tools=mlclient,mlcc"
+
+	econf --enable-utmp \
+		`use_enable truetype anti-alias` \
+		`use_enable bidi fribidi` \
+		`use_enable nls` \
+		--with-imagelib=${imagelib} \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	einstall || die
+
+	dodoc ChangeLog LICENCE README
+
+	docinto ja
+	dodoc doc/ja/*
+	docinto en
+	dodoc doc/en/*
+}