Version bumped, bug #202555.

(Portage version: 2.1.3.19)

4 files changed, 24 insertions, 13 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index 0ce8d1f1110c..6469c9b6c3ff 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/mlterm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.59 2007/05/01 11:20:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.60 2007/12/17 17:10:56 matsuu Exp $
+
+*mlterm-2.9.4 (17 Dec 2007)
+
+  17 Dec 2007; MATSUU Takuto <matsuu@gentoo.org> -mlterm-2.9.2.ebuild,
+  +mlterm-2.9.4.ebuild:
+  Version bumped, bug #202555.
+  Removed old version.
 
   01 May 2007; Markus Rothe <corsair@gentoo.org> mlterm-2.9.3-r1.ebuild:
   Stable on ppc64; bug #175813
diff --git a/x11-terms/mlterm/files/digest-mlterm-2.9.2 b/x11-terms/mlterm/files/digest-mlterm-2.9.2
deleted file mode 100644
index a771e7e17709..000000000000
--- a/x11-terms/mlterm/files/digest-mlterm-2.9.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 be561bfe646a112ce7400b9d0db41e82 mlterm-2.9.2.tar.gz 1980109
-RMD160 c83693c353f266333dc85588d8c1366925cca79c mlterm-2.9.2.tar.gz 1980109
-SHA256 e5ff08c516c4edabc51b12e177b6e653a8d01ea5bec2684b9db2c75ec95d268a mlterm-2.9.2.tar.gz 1980109
diff --git a/x11-terms/mlterm/files/digest-mlterm-2.9.4 b/x11-terms/mlterm/files/digest-mlterm-2.9.4
new file mode 100644
index 000000000000..f11433e39455
--- /dev/null
+++ b/x11-terms/mlterm/files/digest-mlterm-2.9.4
@@ -0,0 +1,3 @@
+MD5 67fc33f09da045f86b0d4ceebed76aac mlterm-2.9.4.tar.gz 1991879
+RMD160 7267ab5f413571611c6b568b5bac5cea41123d92 mlterm-2.9.4.tar.gz 1991879
+SHA256 6b90e880cbb5dfc091aa0e2da9c75675a84b13bf0f628dc02250026bbbcebe4d mlterm-2.9.4.tar.gz 1991879
diff --git a/x11-terms/mlterm/mlterm-2.9.2.ebuild b/x11-terms/mlterm/mlterm-2.9.4.ebuild
index f340ba457e4c..a7977f3af25a 100644
--- a/x11-terms/mlterm/mlterm-2.9.2.ebuild
+++ b/x11-terms/mlterm/mlterm-2.9.4.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.9.2.ebuild,v 1.9 2006/11/01 18:53:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.9.4.ebuild,v 1.1 2007/12/17 17:10:56 matsuu Exp $
 
 inherit eutils flag-o-matic
 
-IUSE="truetype gtk imlib bidi nls uim"
-#IUSE="${IUSE} m17n-lib iiimf scim"
+IUSE="truetype gtk imlib bidi nls uim scim"
+#IUSE="${IUSE} m17n-lib iiimf"
 
 DESCRIPTION="A multi-lingual terminal emulator"
 HOMEPAGE="http://mlterm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="x86 amd64 ppc hppa ppc64 sparc"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="BSD"
 
 RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
@@ -21,16 +21,19 @@ RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
 	bidi? ( >=dev-libs/fribidi-0.10.4 )
 	nls? ( sys-devel/gettext )
 	uim? ( >=app-i18n/uim-0.3.4.2 )
+	scim? ( || ( >=app-i18n/scim-1.4 app-i18n/scim-cvs ) )
 	virtual/utempter
 	x11-libs/libX11
 	x11-libs/libICE
 	x11-libs/libSM"
 DEPEND="${RDEPEND}"
+#	m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/xwindow
-	epatch ${FILESDIR}/mlterm-2.9.1-gentoo.diff
+	cd "${S}"/xwindow
+	epatch "${FILESDIR}"/${PN}-2.9.1-gentoo.diff
+	epatch "${FILESDIR}"/${PN}-2.9.3-asneeded.diff
 }
 
 src_compile() {
@@ -44,7 +47,7 @@ src_compile() {
 
 	use gtk || myconf="${myconf} --with-tools=mlclient,mlcc"
 
-	# m17n-lib and iiimf aren't stable enough
+	# m17n-lib, and iiimf aren't stable enough
 	#myconf="${myconf} $(use_enable iiimf) $(use_enable m17n-lib m17nlib)"
 
 	append-ldflags $(bindnow-flags)
@@ -54,13 +57,14 @@ src_compile() {
 		$(use_enable bidi fribidi) \
 		$(use_enable nls) \
 		$(use_enable uim) \
+		$(use_enable scim) \
 		--with-imagelib="${imagelib}" \
 		${myconf} || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die
 
 	dodoc ChangeLog LICENCE README