Fixed emake issue with USE='-gtk -imlib'. Fixed CC.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 39 insertions, 28 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index 8c1a58ed8784..ce2e0b61301f 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/mlterm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.63 2008/09/24 13:03:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.64 2008/09/30 16:24:04 matsuu Exp $
+
+*mlterm-2.9.4-r3 (30 Sep 2008)
+
+  30 Sep 2008; MATSUU Takuto <matsuu@gentoo.org> -mlterm-2.9.4-r1.ebuild,
+  +mlterm-2.9.4-r3.ebuild:
+  Fixed emake issue with USE='-gtk -imlib'. Fixed CC. Removed old version.
 
 *mlterm-2.9.4-r2 (24 Sep 2008)
 
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 374438a125d5..ad0925911dd3 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -4,7 +4,7 @@ AUX mlterm-2.9.4-uim15-fix.patch 404 RMD160 b4c5b192306c76e33497a180eac595368d0a
 DIST mlterm-2.9.3.tar.gz 1984977 RMD160 27f4381a8b8b68b07e53bbeb422581beb7527b48 SHA1 65ba5a7bd83accf7f621f84b84debb35c8f215ef SHA256 565e2d3d391390450b953b13f4c1ebf6e67e188c1ec56583459842e592a08e4f
 DIST mlterm-2.9.4.tar.gz 1991879 RMD160 7267ab5f413571611c6b568b5bac5cea41123d92 SHA1 cb2ac8ea34609e387e87bac8198a3256c6cc215f SHA256 6b90e880cbb5dfc091aa0e2da9c75675a84b13bf0f628dc02250026bbbcebe4d
 EBUILD mlterm-2.9.3-r1.ebuild 1784 RMD160 de1895cc27543ed9b5b0402cb021a7c2e0640807 SHA1 e3e1cad5e168aba054361bff5a14dc16240c05a9 SHA256 e8af73c38133371e4bf98c0eb6c9671797f0a002d256aa6fc88c90599cb294f0
-EBUILD mlterm-2.9.4-r1.ebuild 1850 RMD160 da3b8f46dea491a20293678c165885dce79d18e2 SHA1 4ff9da6e5002093adab04ba6ed12e9cb3b4f108f SHA256 bafe7166a555d63c68c03c5de34846759778e44cfbdea0194dcbdd3b7ac0a525
 EBUILD mlterm-2.9.4-r2.ebuild 1887 RMD160 2659f85866b1a67ac4f1719d66b45d0c2e5beff5 SHA1 5af6722bd2efa763d051acc98a22923f57d07aa0 SHA256 c3efafe100b9fc849fd007e91b3a31c42d193b467c6163347186bda67c464ae0
-MISC ChangeLog 8451 RMD160 68288ab8d43a5eacf15432a194d079151d815295 SHA1 7f10045d1c6149d9bd706261548bb28f7ac09a22 SHA256 76c2710deb68202bcefd2f86f053939efa81d17de46c818339c4448b769e280a
+EBUILD mlterm-2.9.4-r3.ebuild 1920 RMD160 189843eddfda2c990b4c2f5e74fb65bf0c133fae SHA1 0567c7fc2c20a6852c09b46d7949dcbf505314b7 SHA256 450f1403689985ffb33f3291c20dc63912b7ebf39735d70285a8c231caf49b5a
+MISC ChangeLog 8660 RMD160 c2570eb9df2efbbd2075c532ef84cd036087e83b SHA1 48e3a3721144f08ec4e1a1252018731d95e44c44 SHA256 389cf858157c1b03f556044a17392ba0d02199220c5cff9de210721764d28335
 MISC metadata.xml 259 RMD160 b1ffae81fff999e947154f7cb18bc3784f50b664 SHA1 1f2677ec74f053ef6818258591bfe90d3c0a96cb SHA256 38114f44ef60c6b017b812f5e8b3414a6103d98b13451dc1bc1d1a6c417ed295
diff --git a/x11-terms/mlterm/mlterm-2.9.4-r1.ebuild b/x11-terms/mlterm/mlterm-2.9.4-r3.ebuild
index e29ab4fc0fe2..5a75d977d6e0 100644
--- a/x11-terms/mlterm/mlterm-2.9.4-r1.ebuild
+++ b/x11-terms/mlterm/mlterm-2.9.4-r3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.9.4-r1.ebuild,v 1.2 2008/09/24 13:03:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.9.4-r3.ebuild,v 1.1 2008/09/30 16:24:04 matsuu Exp $
 
-inherit eutils flag-o-matic
+inherit eutils toolchain-funcs
 
-IUSE="truetype gtk imlib bidi nls uim scim"
-#IUSE="${IUSE} m17n-lib iiimf"
+IUSE="truetype gtk imlib bidi nls uim scim m17n-lib"
+#IUSE="${IUSE} iiimf"
 
 DESCRIPTION="A multi-lingual terminal emulator"
 HOMEPAGE="http://mlterm.sourceforge.net/"
@@ -15,19 +15,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="BSD"
 
-RDEPEND="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 )
-	uim? ( >=app-i18n/uim-0.3.4.2 )
-	scim? ( || ( >=app-i18n/scim-1.4 app-i18n/scim-cvs ) )
-	virtual/utempter
+RDEPEND="virtual/utempter
 	x11-libs/libX11
 	x11-libs/libICE
-	x11-libs/libSM"
-DEPEND="${RDEPEND}"
-#	m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )
+	x11-libs/libSM
+	gtk? ( >=x11-libs/gtk+-2 )
+	!gtk? ( imlib? ( >=media-libs/imlib-1.9.14 ) )
+	truetype? ( x11-libs/libXft )
+	bidi? ( >=dev-libs/fribidi-0.10.4 )
+	nls? ( virtual/libintl )
+	uim? ( >=app-i18n/uim-1.0 )
+	scim? ( >=app-i18n/scim-1.4 )
+	m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
@@ -39,18 +41,21 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf imagelib
+	local myconf
 
 	if use gtk ; then
-		imagelib="gdk-pixbuf"
-	elif use imlib ; then
-		imagelib="imlib"
+		myconf="${myconf} --with-imagelib=gdk-pixbuf"
+	else
+		if use imlib ; then
+			myconf="${myconf} --with-imagelib=imlib"
+		else
+			myconf="${myconf} --with-imagelib=''"
+		fi
+		myconf="${myconf} --with-tools=mlclient,mlcc"
 	fi
 
-	use gtk || myconf="${myconf} --with-tools=mlclient,mlcc"
-
-	# m17n-lib, and iiimf aren't stable enough
-	#myconf="${myconf} $(use_enable iiimf) $(use_enable m17n-lib m17nlib)"
+	# iiimf isn't stable enough
+	#myconf="${myconf} $(use_enable iiimf)"
 
 	econf --enable-utmp \
 		$(use_enable truetype anti-alias) \
@@ -58,9 +63,9 @@ src_compile() {
 		$(use_enable nls) \
 		$(use_enable uim) \
 		$(use_enable scim) \
-		--with-imagelib="${imagelib}" \
+		$(use_enable m17n-lib m17nlib) \
 		${myconf} || die "econf failed"
-	emake || die "emake failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install () {