Add missing modular X dependencies, and utempter. Thanks to Patrick Lauer in bug #153604.

(Portage version: 2.1.2_rc1-r2)
 (Signed Manifest commit)

3 files changed, 22 insertions, 91 deletions

diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index a1598bd9825b..73ff52463779 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,25 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mlterm-2.9.1-gentoo.diff 346 RMD160 ac1c41ff99912955626daee5dbe38cf77600bace SHA1 b6c0f7514c024e9b8879dadb95fe5c69a70c706f SHA256 d3a79cead3359b0700329ae0df2bcd88e8c3d83911ddd948bc015f488309748c
 MD5 35f136547978c18aed013cdfd088d098 files/mlterm-2.9.1-gentoo.diff 346
 RMD160 ac1c41ff99912955626daee5dbe38cf77600bace files/mlterm-2.9.1-gentoo.diff 346
 SHA256 d3a79cead3359b0700329ae0df2bcd88e8c3d83911ddd948bc015f488309748c files/mlterm-2.9.1-gentoo.diff 346
 DIST mlterm-2.9.2.tar.gz 1980109 RMD160 c83693c353f266333dc85588d8c1366925cca79c SHA256 e5ff08c516c4edabc51b12e177b6e653a8d01ea5bec2684b9db2c75ec95d268a
 DIST mlterm-2.9.3.tar.gz 1984977 RMD160 27f4381a8b8b68b07e53bbeb422581beb7527b48 SHA1 65ba5a7bd83accf7f621f84b84debb35c8f215ef SHA256 565e2d3d391390450b953b13f4c1ebf6e67e188c1ec56583459842e592a08e4f
-EBUILD mlterm-2.9.2.ebuild 1565 RMD160 9df492661b632460d6881d1321c89607422bc94f SHA1 b32286c235f436534d595702f2796b85d5fd800b SHA256 582389cf624c6df06e4300c84c53e9ea470661acec0c61deaaba2a0bf2711482
-MD5 5510f8ccdafd496819e59fd7363f75fd mlterm-2.9.2.ebuild 1565
-RMD160 9df492661b632460d6881d1321c89607422bc94f mlterm-2.9.2.ebuild 1565
-SHA256 582389cf624c6df06e4300c84c53e9ea470661acec0c61deaaba2a0bf2711482 mlterm-2.9.2.ebuild 1565
-EBUILD mlterm-2.9.3-r1.ebuild 1692 RMD160 b1c3a927a1d834303f7c4240e16e8befffded9b0 SHA1 6fac4fae0dc7ea80ab1c849a0efe738eb2bdefc6 SHA256 598f137b78551d95152aecb6263468807bd938a789c147386ea37a5893bdde03
-MD5 d06b48dae616d98be7933df64c6461e8 mlterm-2.9.3-r1.ebuild 1692
-RMD160 b1c3a927a1d834303f7c4240e16e8befffded9b0 mlterm-2.9.3-r1.ebuild 1692
-SHA256 598f137b78551d95152aecb6263468807bd938a789c147386ea37a5893bdde03 mlterm-2.9.3-r1.ebuild 1692
-EBUILD mlterm-2.9.3.ebuild 1691 RMD160 914df2e214189f9df5346e752e048cf167fc7850 SHA1 9543ceb068f667663224b5849f1f7f76e2b613a8 SHA256 2a34a30e1a7146fa12af2f2a9b3edb7b22c38701f1383f3ad433e20ff809ed0c
-MD5 3c26e3eb57a99f5353f84cb1d1cd8677 mlterm-2.9.3.ebuild 1691
-RMD160 914df2e214189f9df5346e752e048cf167fc7850 mlterm-2.9.3.ebuild 1691
-SHA256 2a34a30e1a7146fa12af2f2a9b3edb7b22c38701f1383f3ad433e20ff809ed0c mlterm-2.9.3.ebuild 1691
-MISC ChangeLog 6608 RMD160 31b96732e821674c747ed86f15a822d5c66c026a SHA1 14f566df3e8f1f320da0a69967613797804abc3b SHA256 8781cc497dc8f1891b9cb138089a9a48fa01a66a38bd191f5b59085220d18e47
-MD5 bbb941e19ee5c199f39b0239d3be1a2e ChangeLog 6608
-RMD160 31b96732e821674c747ed86f15a822d5c66c026a ChangeLog 6608
-SHA256 8781cc497dc8f1891b9cb138089a9a48fa01a66a38bd191f5b59085220d18e47 ChangeLog 6608
+EBUILD mlterm-2.9.2.ebuild 1656 RMD160 2ae48acf304c80685b675769dcee8c1f9e97b3c2 SHA1 f221c26e2ad6471dbc2960df354e1f3833f27e9f SHA256 a904bdd3dff8265817c4205342a9c0f6eac124397c5fbad6402aadc11d2070d8
+MD5 2fa926803207b28fcd083772f897a440 mlterm-2.9.2.ebuild 1656
+RMD160 2ae48acf304c80685b675769dcee8c1f9e97b3c2 mlterm-2.9.2.ebuild 1656
+SHA256 a904bdd3dff8265817c4205342a9c0f6eac124397c5fbad6402aadc11d2070d8 mlterm-2.9.2.ebuild 1656
+EBUILD mlterm-2.9.3-r1.ebuild 1787 RMD160 0a7cf2ff3875f1137e4bd5ffde461b90f3e7762e SHA1 59225407de289e85410d6b119c51c1f09f7dd327 SHA256 2ea18e5724e1a5123586cbb3aa8b871bead2ab3452d747ea6e13d4839f9f1511
+MD5 043eb54c032012e9bcb08688db2965e2 mlterm-2.9.3-r1.ebuild 1787
+RMD160 0a7cf2ff3875f1137e4bd5ffde461b90f3e7762e mlterm-2.9.3-r1.ebuild 1787
+SHA256 2ea18e5724e1a5123586cbb3aa8b871bead2ab3452d747ea6e13d4839f9f1511 mlterm-2.9.3-r1.ebuild 1787
+MISC ChangeLog 6831 RMD160 7cfd045f72125af7d3cd536de6f856579c0215b8 SHA1 20d21903c4b4f3ac3de1ba32c5235ee97742fd77 SHA256 5abb9dae3c7a8e0c94b2b8bc231d6688f1ae944da5d3df35b7e00de39ac5aad0
+MD5 421eedcf97b5be729b73863ba02cdc65 ChangeLog 6831
+RMD160 7cfd045f72125af7d3cd536de6f856579c0215b8 ChangeLog 6831
+SHA256 5abb9dae3c7a8e0c94b2b8bc231d6688f1ae944da5d3df35b7e00de39ac5aad0 ChangeLog 6831
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
@@ -27,9 +26,13 @@ SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata
 MD5 b7e813c428391ac5214fd6030ccee072 files/digest-mlterm-2.9.2 241
 RMD160 0d27e9964796cf5a18a94947d458d231a431f39b files/digest-mlterm-2.9.2 241
 SHA256 c6125ad64ceaf79f84e35f8d045951490678fd8841b0eb9549e368ef98a9ad09 files/digest-mlterm-2.9.2 241
-MD5 92fac2c8c32cb0aa495d9851faa4e6db files/digest-mlterm-2.9.3 241
-RMD160 3534dad49be3dcbdb8b4fbf8cb2546a39316922a files/digest-mlterm-2.9.3 241
-SHA256 1bee987d0bc73e81678baf874978df55bf62737ff194844c395144c400d45936 files/digest-mlterm-2.9.3 241
 MD5 92fac2c8c32cb0aa495d9851faa4e6db files/digest-mlterm-2.9.3-r1 241
 RMD160 3534dad49be3dcbdb8b4fbf8cb2546a39316922a files/digest-mlterm-2.9.3-r1 241
 SHA256 1bee987d0bc73e81678baf874978df55bf62737ff194844c395144c400d45936 files/digest-mlterm-2.9.3-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFSOpOAiZjviIA2XgRArZ9AJ0SAF/Wsuqe94h56TrgrWvqp8F4fgCg23yY
+30LIG5bK6y07av9XSlkUgoM=
+=GKN1
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/mlterm/files/digest-mlterm-2.9.3 b/x11-terms/mlterm/files/digest-mlterm-2.9.3
deleted file mode 100644
index 1f2034289bea..000000000000
--- a/x11-terms/mlterm/files/digest-mlterm-2.9.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 20188c0981a49dbb95c3ff5b8eb25365 mlterm-2.9.3.tar.gz 1984977
-RMD160 27f4381a8b8b68b07e53bbeb422581beb7527b48 mlterm-2.9.3.tar.gz 1984977
-SHA256 565e2d3d391390450b953b13f4c1ebf6e67e188c1ec56583459842e592a08e4f mlterm-2.9.3.tar.gz 1984977
diff --git a/x11-terms/mlterm/mlterm-2.9.3.ebuild b/x11-terms/mlterm/mlterm-2.9.3.ebuild
deleted file mode 100644
index bb33168500d7..000000000000
--- a/x11-terms/mlterm/mlterm-2.9.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.1 2006/06/15 17:07:18 usata Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="truetype gtk imlib bidi nls uim"
-#IUSE="${IUSE} m17n-lib iiimf scim"
-
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~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 )
-	uim? ( >=app-i18n/uim-0.3.4.2 )"
-#	scim? ( >=app-i18n/scim-1.2.1 )
-#	m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/xwindow
-	epatch ${FILESDIR}/mlterm-2.9.1-gentoo.diff
-}
-
-src_compile() {
-	local myconf imagelib
-
-	if use gtk ; then
-		imagelib="gdk-pixbuf"
-	elif use imlib ; then
-		imagelib="imlib"
-	fi
-
-	use gtk || myconf="${myconf} --with-tools=mlclient,mlcc"
-
-	# m17n-lib, iiimf and scim aren't stable enough
-	#myconf="${myconf} $(use_enable iiimf) $(use_enable m17n-lib m17nlib)"
-	#myconf="${myconf} $(use_enable scim)"
-
-	append-ldflags $(bindnow-flags)
-
-	econf --enable-utmp \
-		$(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"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog LICENCE README
-
-	docinto ja
-	dodoc doc/ja/*
-	docinto en
-	dodoc doc/en/*
-}