Removed "append-ldflags $(bindnow-flags)", bug #223781. Added m17n-lib USE flag. Removed old versions.

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

5 files changed, 48 insertions, 50 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index 3883e1290aa8..8c1a58ed8784 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.62 2008/08/21 22:27:03 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.63 2008/09/24 13:03:22 matsuu Exp $
+
+*mlterm-2.9.4-r2 (24 Sep 2008)
+
+  24 Sep 2008; MATSUU Takuto <matsuu@gentoo.org> mlterm-2.9.3-r1.ebuild,
+  -mlterm-2.9.4.ebuild, mlterm-2.9.4-r1.ebuild, +mlterm-2.9.4-r2.ebuild:
+  Removed "append-ldflags $(bindnow-flags)", bug #223781. Added m17n-lib USE
+  flag. Removed old versions.
 
   21 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index d274758a6abf..374438a125d5 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mlterm-2.9.1-gentoo.diff 346 RMD160 ac1c41ff99912955626daee5dbe38cf77600bace SHA1 b6c0f7514c024e9b8879dadb95fe5c69a70c706f SHA256 d3a79cead3359b0700329ae0df2bcd88e8c3d83911ddd948bc015f488309748c
 AUX mlterm-2.9.3-asneeded.diff 655 RMD160 f020bbc01a27f1a133b43b9a37bc2a28a87c6a81 SHA1 dae2d1107484e0eb11a33b4b385f7d071e223942 SHA256 41a134c9adfdfc6b7e4f7f1cd2eb7e45b67b10a1b525e2ad3c8bd6ed581f2d78
 AUX mlterm-2.9.4-uim15-fix.patch 404 RMD160 b4c5b192306c76e33497a180eac595368d0abcb5 SHA1 1f246fe65fb844d804b3ec125fa9a414abaa4c15 SHA256 6d1522e4afa3205a7dc7e0ce12dbd1eece9f11d753ac5ca771b2e2f0ece33856
 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 1819 RMD160 3ceded7880f7aa4312c013727de7d490d6e97296 SHA1 e011856c87020d153fadffb846e97d57941c7595 SHA256 0ee2a7a7a89773e26e95d4cb59013726d39a2a0bdefb8a6733c538bdfa071db8
-EBUILD mlterm-2.9.4-r1.ebuild 1884 RMD160 15a617cd9c78ca8cf3e8c5c0e40271e62d722b65 SHA1 2bbd62236926eb95a7d7b06550c3a7406a560928 SHA256 49486b8a50a4e1c722bfa8377e1858538f5ebbf56f26ff15c11ce70c4a72183e
-EBUILD mlterm-2.9.4.ebuild 1835 RMD160 7e298228a49a6d2a976fdbc70bbdc67d14c1c513 SHA1 fa0d8afea9ee7009564d329a7787a02c2b7dd670 SHA256 2686f9f5221203ccdfbafe6563a57956ee0cdcb4d56733b8760de724985b7193
-MISC ChangeLog 8165 RMD160 28d41afedb5a098b2f1e7c072ec63d6e90a2df88 SHA1 a375a0bad2c147d8431b36e1418ac52713e59db9 SHA256 693e08ac0a2c65ff0adf7f3ef73fc5015c117ef837c0369cd8ecb77c643b0310
+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
 MISC metadata.xml 259 RMD160 b1ffae81fff999e947154f7cb18bc3784f50b664 SHA1 1f2677ec74f053ef6818258591bfe90d3c0a96cb SHA256 38114f44ef60c6b017b812f5e8b3414a6103d98b13451dc1bc1d1a6c417ed295
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkit67wACgkQoeSe8B0zEfzAygCfYz2O3WGOsoSZ7R2fDKAqOec/
-LGUAn2ODVy3XvwK9p1+pcKwOPuEMdgJg
-=2Z9b
------END PGP SIGNATURE-----
diff --git a/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild b/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild
index 29fdf4983af6..96aa98152ec5 100644
--- a/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild
+++ b/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.3-r1.ebuild,v 1.10 2007/05/01 11:20:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild,v 1.11 2008/09/24 13:03:22 matsuu Exp $
 
 inherit eutils flag-o-matic
 
@@ -50,8 +50,6 @@ src_compile() {
 	# m17n-lib, and iiimf aren't stable enough
 	#myconf="${myconf} $(use_enable iiimf) $(use_enable m17n-lib m17nlib)"
 
-	append-ldflags $(bindnow-flags)
-
 	econf --enable-utmp \
 		$(use_enable truetype anti-alias) \
 		$(use_enable bidi fribidi) \
diff --git a/x11-terms/mlterm/mlterm-2.9.4-r1.ebuild b/x11-terms/mlterm/mlterm-2.9.4-r1.ebuild
index 5259ce011d42..e29ab4fc0fe2 100644
--- a/x11-terms/mlterm/mlterm-2.9.4-r1.ebuild
+++ b/x11-terms/mlterm/mlterm-2.9.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2008/05/25 15:43:25 matsuu Exp $
+# $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 $
 
 inherit eutils flag-o-matic
 
@@ -52,8 +52,6 @@ src_compile() {
 	# m17n-lib, and iiimf aren't stable enough
 	#myconf="${myconf} $(use_enable iiimf) $(use_enable m17n-lib m17nlib)"
 
-	append-ldflags $(bindnow-flags)
-
 	econf --enable-utmp \
 		$(use_enable truetype anti-alias) \
 		$(use_enable bidi fribidi) \
diff --git a/x11-terms/mlterm/mlterm-2.9.4.ebuild b/x11-terms/mlterm/mlterm-2.9.4-r2.ebuild
index a7977f3af25a..f527aefec527 100644
--- a/x11-terms/mlterm/mlterm-2.9.4.ebuild
+++ b/x11-terms/mlterm/mlterm-2.9.4-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.ebuild,v 1.1 2007/12/17 17:10:56 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.9.4-r2.ebuild,v 1.1 2008/09/24 13:03:22 matsuu Exp $
 
-inherit eutils flag-o-matic
+inherit eutils
 
-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,42 +15,47 @@ 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}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-uim15-fix.patch
 	cd "${S}"/xwindow
 	epatch "${FILESDIR}"/${PN}-2.9.1-gentoo.diff
 	epatch "${FILESDIR}"/${PN}-2.9.3-asneeded.diff
 }
 
 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} --without-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)"
-
-	append-ldflags $(bindnow-flags)
+	# iiimf isn't stable enough
+	#myconf="${myconf} $(use_enable iiimf)"
 
 	econf --enable-utmp \
 		$(use_enable truetype anti-alias) \
@@ -58,7 +63,7 @@ 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"
 }
@@ -66,7 +71,7 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install || die
 
-	dodoc ChangeLog LICENCE README
+	dodoc ChangeLog README
 
 	docinto ja
 	dodoc doc/ja/*