Replace dependency on virtual/utempter, bug 361117.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

5 files changed, 18 insertions, 24 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index e3673757898a..bf2f1de80c67 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/mlterm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.75 2011/03/28 14:32:57 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.76 2011/04/05 11:31:59 ulm Exp $
+
+  05 Apr 2011; Ulrich Mueller <ulm@gentoo.org> mlterm-2.9.3-r1.ebuild,
+  mlterm-2.9.4-r4.ebuild, mlterm-3.0.1.ebuild:
+  Replace dependency on virtual/utempter, bug 361117.
 
   28 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   mlterm-2.9.3-r1.ebuild, mlterm-2.9.4-r4.ebuild:
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index bb998072fae1..f2c43516cd31 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -8,25 +8,15 @@ DIST mlterm-2.9.3.tar.gz 1984977 RMD160 27f4381a8b8b68b07e53bbeb422581beb7527b48
 DIST mlterm-2.9.4.tar.gz 1991879 RMD160 7267ab5f413571611c6b568b5bac5cea41123d92 SHA1 cb2ac8ea34609e387e87bac8198a3256c6cc215f SHA256 6b90e880cbb5dfc091aa0e2da9c75675a84b13bf0f628dc02250026bbbcebe4d
 DIST mlterm-2.9.4_256.patch 15238 RMD160 4c982835ae212cc54ba936166bb7afb9cbba78ef SHA1 f9f264d8b0c76016dd9c42e63526731dd59f1f9b SHA256 6bde3d3ebe3552d192853119c84c687ebe6b7c892e149c863e1a6c9534fd6347
 DIST mlterm-3.0.1.tar.gz 2645619 RMD160 987b82f48c8a4c8e1419a7563f77c4beb37b1f34 SHA1 fd2be79969fc094da81776ea9b5a12f08a2499d4 SHA256 ad52d19be474d07ae0237304af4caf899fb54448df32e0e7909a12f668b796dd
-EBUILD mlterm-2.9.3-r1.ebuild 1788 RMD160 6ca64419dce89ddf1989b34271911b92cd1246c6 SHA1 fa044d3a690b358903b3c816b4c7c5252ba1a5fc SHA256 f191409c4350f1bf39701b481aa79608a9b5a034cacc0fd1d0763c559449d67e
-EBUILD mlterm-2.9.4-r4.ebuild 1998 RMD160 50cf0ce4f7961fdc8d662a66f1d68e62eaa69551 SHA1 0102cd4b9028c6141bb94781e70a11e441c47b8a SHA256 5a094b4eb886dab94e6e553ebbae0b391b7e6b30ad693436ff44d0d6eee2da88
-EBUILD mlterm-3.0.1.ebuild 1915 RMD160 ba6abd6524c505b41292561cb87b98bdebddcabb SHA1 eeb3b732e0456a10122d84dd768f3e3bf2cdb068 SHA256 efa806c7599a527c9105461001b9e75cf0e0241ad99b5a3e78fd3968da9ee4cc
-MISC ChangeLog 9961 RMD160 0420c34efb97587a322f2c966d37cd874a887e0d SHA1 0f6cd09863d640ac125b557757a289a815772713 SHA256 a212d0327652998f2df0df0f64c946dacb7ccfe6e21b44afb43255424f07e39f
+EBUILD mlterm-2.9.3-r1.ebuild 1812 RMD160 c2e15c9dbed91f78cb6948b648e765b1212581b8 SHA1 a0bae0fd6ccd053cdfb92ce3cacf0ce4e65b72e8 SHA256 4a535d757445464610c1baeffc409150600a725575fb6b25e33694d7dca54afb
+EBUILD mlterm-2.9.4-r4.ebuild 2023 RMD160 64debdd338fa06cce9b5681434885b7f16205f74 SHA1 d4b0cf3ccc8c3f716f484e980230442908243185 SHA256 e2fb393a657dd301fb311279d9c9ecc61a72bfd127f74da29401f661c9a67f5b
+EBUILD mlterm-3.0.1.ebuild 1940 RMD160 4847fdc3b8103732c1a9b20fe3a8c267cd7fa484 SHA1 46f51c0d11bc759b909aaa5f7bd411719fe94b48 SHA256 d68a42e662b187fc69fa430351f2c47546887b813cb3431cf8dbf0453789e108
+MISC ChangeLog 10129 RMD160 e5e641d5a115de7e76e0c68aed52200a009496aa SHA1 a8301b47ba41937905d85ced17cc4009de7fd223 SHA256 c74fb7ef47181677b08c19cffbaf30a6240f7f765ef025d143f93ef548c372a7
 MISC metadata.xml 259 RMD160 b1ffae81fff999e947154f7cb18bc3784f50b664 SHA1 1f2677ec74f053ef6818258591bfe90d3c0a96cb SHA256 38114f44ef60c6b017b812f5e8b3414a6103d98b13451dc1bc1d1a6c417ed295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNkJwfAAoJEO/kOhxWD91k6l4QAJTwGIi6izWxQHPOQOW1qd8e
-47vtpFudbYcS/dHhxiuoaY81Yip9OSJNV/cIBuyKQEGhFretG0xtuSsZszc2KENR
-QjdjhFuf0R+ejscKWU13zXgyOH5MiTp+SJkUBJAH5fC+luk2L/Fe37262OO8wIKb
-N99JzsQ3I03MUJwMBlymtgFKfCZl2aD8AftkNfyMSVcJEJpeop8POEY+0MEguyrR
-IxFa0HEq+Lz04s1MZCl+vCfZVbkUjjINccD/wVhsAmRPH3F2GauvAOuF1pWXzG0Y
-H63A9amGs6ZnA4fa4aRjHb59qAv4eRRSOWt4DfWycPsI1Tj52v42Vaeo2E44VLoA
-Vk+vgb6JVK+GsdFRE+FK5keGcC5HBHk/oRcj+3je/ulbBoBEAf5DYu7CuAK1j7Ax
-C3sAnj+wLGZgheu8L5v7TsZm4F4aP4XPIzh6Rd0k73+4W3YTA6oHtGeXNcmq84SV
-XhYtj2x0MjzTkU1Eb9a7dOBJKqj46B9FrrXLyMw/CGBhGyhgnCo/W5b2cznkBo07
-z7KJ7UwYTahF7P8SQiYdv2MKz475xRB+p27zpoDRLdIeN0wCTtJRb8HPh0zH/EiC
-dhD2EVJQR5U8aysToiM7kQHyVfsy99U1W17HbclrfMobiNRM3xr234Kbhg4BjXd7
-/HrpW6CJcQcQrtU9dJ+P
-=tbQB
+iEYEARECAAYFAk2a/e4ACgkQOeoy/oIi7uzbawCgpglY9Xe9V+nDJzE3X2MHMXcX
+zWkAnRLuoJIkGPQykH/F8UTWea19owj7
+=vPSA
 -----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 6d659789fb6e..135eab5447aa 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-2011 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.14 2011/03/28 14:32:57 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild,v 1.15 2011/04/05 11:31:59 ulm Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ RDEPEND="gtk? ( x11-libs/gtk+:2 )
 	nls? ( sys-devel/gettext )
 	uim? ( >=app-i18n/uim-0.3.4.2 )
 	scim? ( || ( >=app-i18n/scim-1.4 app-i18n/scim-cvs ) )
-	virtual/utempter
+	|| ( sys-libs/libutempter sys-apps/utempter )
 	x11-libs/libX11
 	x11-libs/libICE
 	x11-libs/libSM"
diff --git a/x11-terms/mlterm/mlterm-2.9.4-r4.ebuild b/x11-terms/mlterm/mlterm-2.9.4-r4.ebuild
index bd960847c8ff..3626d6e631ad 100644
--- a/x11-terms/mlterm/mlterm-2.9.4-r4.ebuild
+++ b/x11-terms/mlterm/mlterm-2.9.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r4.ebuild,v 1.9 2011/03/28 14:32:57 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.9.4-r4.ebuild,v 1.10 2011/04/05 11:31:59 ulm Exp $
 
 EAPI="1"
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 x86"
 LICENSE="BSD"
 
-RDEPEND="virtual/utempter
+RDEPEND="|| ( sys-libs/libutempter sys-apps/utempter )
 	x11-libs/libX11
 	x11-libs/libICE
 	x11-libs/libSM
diff --git a/x11-terms/mlterm/mlterm-3.0.1.ebuild b/x11-terms/mlterm/mlterm-3.0.1.ebuild
index 433f61de3bad..0c4e7913f224 100644
--- a/x11-terms/mlterm/mlterm-3.0.1.ebuild
+++ b/x11-terms/mlterm/mlterm-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.1.ebuild,v 1.2 2011/02/13 18:01:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.1.ebuild,v 1.3 2011/04/05 11:31:59 ulm Exp $
 
 EAPI="2"
 inherit eutils
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 LICENSE="BSD"
 
-RDEPEND="virtual/utempter
+RDEPEND="|| ( sys-libs/libutempter sys-apps/utempter )
 	x11-libs/libX11
 	x11-libs/libICE
 	x11-libs/libSM