Fix desktop file's category. #421517; Drop old versions.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

9 files changed, 37 insertions, 455 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index 20334c39e987..c0ac34482427 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-terms/mlterm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.90 2012/05/03 07:11:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.91 2012/06/21 13:41:09 naota Exp $
+
+*mlterm-3.0.11-r1 (21 Jun 2012)
+*mlterm-3.0.9-r1 (21 Jun 2012)
+
+  21 Jun 2012; Naohiro Aota <naota@gentoo.org> +mlterm-3.0.11-r1.ebuild,
+  +mlterm-3.0.9-r1.ebuild, -mlterm-3.0.1.ebuild, -mlterm-3.0.11.ebuild,
+  -mlterm-3.0.3.ebuild, -mlterm-3.0.5.ebuild, -mlterm-3.0.6.ebuild,
+  -mlterm-3.0.7.ebuild, -mlterm-3.0.8.ebuild, mlterm-2.9.4-r4.ebuild:
+  Fix desktop file's category. #421517; Drop old versions.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> mlterm-2.9.4-r4.ebuild,
   mlterm-3.0.1.ebuild, mlterm-3.0.3.ebuild, mlterm-3.0.5.ebuild,
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 7ce48b9883ff..4d64715c9078 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
@@ -9,22 +12,28 @@ AUX mlterm-3.0.7-underlinking.patch 385 RMD160 6b2c4c82fb88f628d33f1c58c4a778442
 AUX mlterm-3.0.8-ldflags.patch 854 RMD160 6a7c98c584e64744d7d8cdbc4f95203384ebb653 SHA1 64916d7ae8db063e5a572806973fd1f29046286a SHA256 95c7faa8e3fa53f65d89546291c0752518e754f1d64e47e6849eae7997710094
 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
 DIST mlterm-3.0.11.tar.gz 4328395 RMD160 f7f08da0ad428bc364986b97013e5165a9545fa7 SHA1 368d972588b0d0da00a866b6583e01b5f0a33625 SHA256 808f15756aa40ada65a9b5760d9d1e4f281b62bb915ab51f4dd44e21a43f1e55
-DIST mlterm-3.0.3.tar.gz 2706811 RMD160 db4ff4c4d5f08a5055213debdbbdfd3d93773cc9 SHA1 bec5406a8d47eaa9e50afb2656ac876864f15228 SHA256 be3f440ef884e739cc0dfa5f805a1d560508746fd4c9895817e3d9169bbbbe6d
-DIST mlterm-3.0.5.tar.gz 2722809 RMD160 bece240fe92211129ff0392b8ab79d673a07b6a1 SHA1 277f4083049c2bf5a0d4aacf7ff1a8e8c4f4e265 SHA256 f9391fa9258d3b5bc0cce47d9b6e3a9058c80773f643972fe64e5d76440e727a
-DIST mlterm-3.0.6.tar.gz 3375241 RMD160 1815061f4e985e1f945d6b7fb1e254349f811cbd SHA1 867858fa3e6ea6d0c7aecff90d3332881a7db3e8 SHA256 7de81f5b296312e39312481a14d75e93c6a7ddde385b08c22a31e61c168005f1
-DIST mlterm-3.0.7.tar.gz 3394779 RMD160 52cca8fb2613c52c5e82bcb1727b51a958aeeaf9 SHA1 999da0a6dd1ad42256aef9ca4c7f9e369e245f56 SHA256 cd891debdfad285f49988086f436ec044f2e5b15aa191c0823e27c9640370504
-DIST mlterm-3.0.8.tar.gz 3396207 RMD160 60ac629d476f03e26fafa5ff358d0a9add2413ad SHA1 185f629951cd291212a1fc6b3f7698c9d72c86b1 SHA256 394e570e96c296e63dc607a392038fa0b90eb9c2269f7a684220bf258ce1640e
 DIST mlterm-3.0.9.tar.gz 3414333 RMD160 4a41363978d8ba50c9d1acb12b1099a14964019e SHA1 194e580fcd243015f1a3226f01d6bc6ba547c346 SHA256 713ecd5bd051bec99f0ba62f1b5529bc6eef53f5cd84515b5aad8c062154f2af
 EBUILD mlterm-2.9.4-r4.ebuild 2025 RMD160 bbdcb142ca13a37cc4a9ef96bd2c2e28dc93c49c SHA1 175056cf9d0fda738a1eede6640934bb452b0906 SHA256 85238c9996eb71c0233d9e3ebe29cfcb657fbb47256e5fa1334d57e15e963f1b
-EBUILD mlterm-3.0.1.ebuild 1942 RMD160 19f338962013edd785e6c4ab0499fc3e88d18bf3 SHA1 60055e26c379969b74dd49f3000ccedd9d9f6a9b SHA256 3f4c56dda4cca0b4c248c4ddc404ac43b5fdbdf581e1647e8323e65f0a3deaa6
-EBUILD mlterm-3.0.11.ebuild 2189 RMD160 0ceadfe136e2450d01fa2a6c75b3057ea9ccd093 SHA1 5c55b751f8912a2765059c06bea99deebb3a3213 SHA256 89ede38bc8c89f03d7878387225da10f1efa213bba079dde484752667c7da96d
-EBUILD mlterm-3.0.3.ebuild 1926 RMD160 9b43c08eed2e08f8ffa0df163515a5f02dc1ac15 SHA1 de59c823ece88e712a1c921a99dc477252bd175a SHA256 2a258b7919371aad23b5a31166c971c9d8a047716e23696df3422e6d22263c5e
-EBUILD mlterm-3.0.5.ebuild 2183 RMD160 5a98cec5d138343a58d8aa3aa2ba8e0b2ea34d28 SHA1 64d8a0172fc89cbfd33e5abaeba17d693c3f32ce SHA256 3ac113651b8b2278b25fe5e99668f205c684cfb19a2ab4fbaef0e7d5870829ca
-EBUILD mlterm-3.0.6.ebuild 2183 RMD160 ed1bcf9698efb519dd1d524e91d6acbf7bbcad5b SHA1 74bc12a7cdddd9e3f094d7feb08edb7921720952 SHA256 5354aac46369cd2ea44cb94a126445877593faa88da6fbc532eeb8d3c4d13d75
-EBUILD mlterm-3.0.7.ebuild 2232 RMD160 7f70efc941d665174e99b71139365bfcf40fe572 SHA1 cc23d9e71a9af161e6d6668ae297b7a5d1b59608 SHA256 c48f9a28a7666a5215f28235629f69cbe67890ddf97793cc8eaa4d507df78f07
-EBUILD mlterm-3.0.8.ebuild 2232 RMD160 f5cbb944b17cc38ed664ef0d0133719cd43631b7 SHA1 5492b0c38a72ce49a58aaaf200c4b054f7838ee8 SHA256 fd47e05959b0ae72abadcdaf46aab7009a6045c61eeb72e7aea98a68a24d55ad
+EBUILD mlterm-3.0.11-r1.ebuild 2200 RMD160 01ab5bf75beb7707ed20f48d0fde607c1907cf4a SHA1 5eeec905a7de2b3c71c50da0634473502cb16d82 SHA256 006f883d179b2b353dd56307985f80a03e502025ab3d1754fed7e6cc985575bd
+EBUILD mlterm-3.0.9-r1.ebuild 2243 RMD160 b6edb583dabd488665e78debe6a6bba99984178c SHA1 c7ab78fc30df5017f261438a9043091cc2da48ee SHA256 93f3d804fdd86977305638420f999032c8ac1e69a1092d2ad68a93d464063475
 EBUILD mlterm-3.0.9.ebuild 2227 RMD160 94f13e7dbd1283d13d6232bf0c5d444d20f00fde SHA1 643ff8df5a1d05ec9c47186cf6ebaf4eb0ef2bcd SHA256 0914534a24505a90b63a5014969dee7fd8ee2a61e4fcf20772385149ad1ed1c4
-MISC ChangeLog 12488 RMD160 f23e1f43fabdf6b4c10c9348af54b6635c3ccc27 SHA1 8c971cc2a4af3b872c9993bde3d7a71ba88460c1 SHA256 796c80ee74ad28d7efc1d6c8c0d375b3371981934571fa57118e43e25640c976
+MISC ChangeLog 12894 RMD160 313504df45713138abdf77634cd98a6da0c33563 SHA1 4930c26c1f2b2e8070a6e816611f7edcbef48c06 SHA256 b5e85f914c1e48b8b11dc4bc140e4ecacda5fc77ed414fd8cb9883c1c3ca0102
 MISC metadata.xml 437 RMD160 d1d4f040651f40c22b8aacfde78ce7010f50a48b SHA1 6dd63e7dffb255974ec1924f4ec3d9f936f36d1b SHA256 744b11cde46f9a273b1f0482c66d133ab451739776f84e6783d148a73cb52a38
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJP4yR6AAoJEDYO1FT4VRUUT70P/RGxojytrND3L8T28mmL5AvZ
+LS6u1KiRdRALL0/CNgRD5Yen4bdktUyob7UpBMdVbIlEjRTejbjFSPFehmMT6Uk1
+3oYNBS9/lv1mg1SklWYPe6tB/l0yRDxPkKU3RNnpG83oNt/Qa9ePVqlu/EgmAs4Z
+dz05ox5iQRacCTYr/MQuMAs4jRSByR3geNFj497i/LhhBMZ7w+k3DcUIKJ5tKWY2
+MrCm02m29g/SdtukAggJV+XiG9/F/vGUJcy79jfYgCr29gHhOYc3OEnC8yuIWOSN
+fWqejcH5BSwRkOXiDSsSUeNj95xC2k1fRKkWjoszmhZgBtEsT9iWoPj3KttyRcQd
+QJ8CwGa7cnW5hRmbcpuwVN7Z+sjsfzFTfq1iwxuA8chWCK2hfSX16Tu4HtvERtRX
+TfNDQW2OPP7IAb+Obccbkpg7Kz/0ecoe08gqdx59cK5apEU8vne+P607GdB3AXBk
+ndZN+spTNAQOYSCVM6iU48/J+r/6GuQ4+HIW+nqVCEeXS0ywzEcXC9zMTkZkhKgB
+IzyIbZYM1JLvaqEr+D46xCKIf1k8Cj6EE6ABhEVQUDm0K9zvb1xrtgKosSrvNmw+
+C5owLFkmPuKQXGxkUt6oW0uB3/DBSp6EdCsBMV516Ke83Bic8ek/WFR3HTmXAFN/
+MMnd6VsdbYDSCf1USHB1
+=TQnV
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/mlterm/mlterm-3.0.1.ebuild b/x11-terms/mlterm/mlterm-3.0.1.ebuild
deleted file mode 100644
index 1d8e41b07a46..000000000000
--- a/x11-terms/mlterm/mlterm-3.0.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 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.4 2012/05/03 07:11:34 jdhore Exp $
-
-EAPI="2"
-inherit eutils
-
-IUSE="bidi imlib gtk m17n-lib nls scim truetype uim"
-#IUSE="${IUSE} iiimf"
-
-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 ~x86"
-LICENSE="BSD"
-
-RDEPEND="|| ( sys-libs/libutempter sys-apps/utempter )
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	gtk? ( x11-libs/gtk+:2 )
-	!gtk? ( imlib? ( media-libs/imlib2 ) )
-	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}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.9.4-uim15-fix.patch
-	cd "${S}"/xwindow
-	epatch "${FILESDIR}"/${PN}-2.9.1-gentoo.diff
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk ; then
-		myconf="${myconf} --with-imagelib=gdk-pixbuf"
-	else
-		if use imlib ; then
-			myconf="${myconf} --with-imagelib=imlib2"
-		else
-			myconf="${myconf} --with-imagelib=''"
-		fi
-		myconf="${myconf} --with-tools=mlclient,mlcc"
-	fi
-
-	# iiimf isn't stable enough
-	#myconf="${myconf} $(use_enable iiimf)"
-
-	econf --enable-utmp \
-		$(use_enable truetype anti-alias) \
-		$(use_enable bidi fribidi) \
-		$(use_enable nls) \
-		$(use_enable uim) \
-		$(use_enable scim) \
-		$(use_enable m17n-lib m17nlib) \
-		${myconf} || die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	doicon contrib/icon/mlterm* || die
-	make_desktop_entry mlterm mlterm mlterm-icon TerminalEmulator || die
-
-	dodoc ChangeLog README || die
-
-	docinto ja
-	dodoc doc/ja/* || die
-	docinto en
-	dodoc doc/en/* || die
-}
diff --git a/x11-terms/mlterm/mlterm-3.0.11.ebuild b/x11-terms/mlterm/mlterm-3.0.11-r1.ebuild
index 36cec5b4605f..4609e05c58cf 100644
--- a/x11-terms/mlterm/mlterm-3.0.11.ebuild
+++ b/x11-terms/mlterm/mlterm-3.0.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.11.ebuild,v 1.2 2012/05/03 07:11:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.11-r1.ebuild,v 1.1 2012/06/21 13:41:09 naota Exp $
 
 EAPI="3"
 inherit autotools eutils
@@ -81,7 +81,7 @@ src_install () {
 	fi
 
 	doicon contrib/icon/mlterm* || die
-	make_desktop_entry mlterm mlterm mlterm-icon TerminalEmulator || die
+	make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator" || die
 
 	dodoc ChangeLog README || die
 
diff --git a/x11-terms/mlterm/mlterm-3.0.3.ebuild b/x11-terms/mlterm/mlterm-3.0.3.ebuild
deleted file mode 100644
index 30976eee9e73..000000000000
--- a/x11-terms/mlterm/mlterm-3.0.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.3.ebuild,v 1.3 2012/05/03 07:11:34 jdhore Exp $
-
-EAPI="3"
-inherit eutils
-
-IUSE="bidi gtk ibus m17n-lib nls scim static-libs truetype uim"
-#IUSE="${IUSE} iiimf"
-
-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 ~x86"
-LICENSE="BSD"
-
-RDEPEND="|| ( sys-libs/libutempter sys-apps/utempter )
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	gtk? ( x11-libs/gtk+:2 )
-	truetype? ( x11-libs/libXft )
-	bidi? ( >=dev-libs/fribidi-0.10.4 )
-	ibus? ( >=app-i18n/ibus-1.3 )
-	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}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.9.4-uim15-fix.patch \
-		"${FILESDIR}"/${PN}-3.0.3-gentoo.diff
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk ; then
-		myconf="${myconf} --with-imagelib=gdk-pixbuf"
-	else
-		myconf="${myconf} --with-tools=mlclient,mlcc"
-	fi
-
-	# iiimf isn't stable enough
-	#myconf="${myconf} $(use_enable iiimf)"
-
-	econf --enable-utmp \
-		$(use_enable truetype anti-alias) \
-		$(use_enable bidi fribidi) \
-		$(use_enable ibus) \
-		$(use_enable nls) \
-		$(use_enable uim) \
-		$(use_enable scim) \
-		$(use_enable m17n-lib m17nlib) \
-		$(use_enable static-libs static) \
-		${myconf} || die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-
-	doicon contrib/icon/mlterm* || die
-	make_desktop_entry mlterm mlterm mlterm-icon TerminalEmulator || die
-
-	dodoc ChangeLog README || die
-
-	docinto ja
-	dodoc doc/ja/* || die
-	docinto en
-	dodoc doc/en/* || die
-}
diff --git a/x11-terms/mlterm/mlterm-3.0.5.ebuild b/x11-terms/mlterm/mlterm-3.0.5.ebuild
deleted file mode 100644
index 11e92f623b04..000000000000
--- a/x11-terms/mlterm/mlterm-3.0.5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.5.ebuild,v 1.3 2012/05/03 07:11:34 jdhore Exp $
-
-EAPI="3"
-inherit autotools eutils
-
-IUSE="bidi debug gtk ibus libssh2 m17n-lib nls scim static-libs uim xft"
-
-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 ~x86"
-LICENSE="BSD"
-
-RDEPEND="|| ( sys-libs/libutempter sys-apps/utempter )
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	gtk? ( x11-libs/gtk+:2 )
-	xft? ( x11-libs/libXft )
-	bidi? ( >=dev-libs/fribidi-0.10.4 )
-	ibus? ( >=app-i18n/ibus-1.3 )
-	libssh2? ( net-libs/libssh2 )
-	nls? ( virtual/libintl )
-	uim? ( >=app-i18n/uim-1.0 )
-	scim? ( >=app-i18n/scim-1.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )"
-#	vte? ( x11-libs/vte )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.9.4-uim15-fix.patch \
-		"${FILESDIR}"/${PN}-3.0.5-ldflags.patch \
-		"${FILESDIR}"/${PN}-3.0.5-ibus.patch
-
-	eautoconf
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk ; then
-		myconf="${myconf} --with-imagelib=gdk-pixbuf"
-	else
-		myconf="${myconf} --with-tools=mlclient,mlcc"
-	fi
-
-	if use xft ; then
-		myconf="${myconf} --with-type-engines=xft"
-	else
-		myconf="${myconf} --with-type-engines=xcore"
-	fi
-
-	# iiimf isn't stable enough
-	#myconf="${myconf} $(use_enable iiimf)"
-
-	econf --enable-utmp \
-		$(use_enable bidi fribidi) \
-		$(use_enable debug) \
-		$(use_enable ibus) \
-		$(use_enable libssh2 ssh2) \
-		$(use_enable nls) \
-		$(use_enable uim) \
-		$(use_enable scim) \
-		$(use_enable m17n-lib m17nlib) \
-		$(use_enable static-libs static) \
-		${myconf} || die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	doicon contrib/icon/mlterm* || die
-	make_desktop_entry mlterm mlterm mlterm-icon TerminalEmulator || die
-
-	dodoc ChangeLog README || die
-
-	docinto ja
-	dodoc doc/ja/* || die
-	docinto en
-	dodoc doc/en/* || die
-}
diff --git a/x11-terms/mlterm/mlterm-3.0.6.ebuild b/x11-terms/mlterm/mlterm-3.0.6.ebuild
deleted file mode 100644
index 62333b119c68..000000000000
--- a/x11-terms/mlterm/mlterm-3.0.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.6.ebuild,v 1.3 2012/05/03 07:11:34 jdhore Exp $
-
-EAPI="3"
-inherit autotools eutils
-
-IUSE="bidi debug gtk ibus libssh2 m17n-lib nls scim static-libs uim xft"
-
-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 ~x86"
-LICENSE="BSD"
-
-RDEPEND="|| ( sys-libs/libutempter sys-apps/utempter )
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	gtk? ( x11-libs/gtk+:2 )
-	xft? ( x11-libs/libXft )
-	bidi? ( >=dev-libs/fribidi-0.10.4 )
-	ibus? ( >=app-i18n/ibus-1.3 )
-	libssh2? ( net-libs/libssh2 )
-	nls? ( virtual/libintl )
-	uim? ( >=app-i18n/uim-1.0 )
-	scim? ( >=app-i18n/scim-1.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )"
-#	vte? ( x11-libs/vte )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.9.4-uim15-fix.patch \
-		"${FILESDIR}"/${PN}-3.0.5-ldflags.patch \
-		"${FILESDIR}"/${PN}-3.0.5-ibus.patch
-
-	eautoconf
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk ; then
-		myconf="${myconf} --with-imagelib=gdk-pixbuf"
-	else
-		myconf="${myconf} --with-tools=mlclient,mlcc"
-	fi
-
-	if use xft ; then
-		myconf="${myconf} --with-type-engines=xft"
-	else
-		myconf="${myconf} --with-type-engines=xcore"
-	fi
-
-	# iiimf isn't stable enough
-	#myconf="${myconf} $(use_enable iiimf)"
-
-	econf --enable-utmp \
-		$(use_enable bidi fribidi) \
-		$(use_enable debug) \
-		$(use_enable ibus) \
-		$(use_enable libssh2 ssh2) \
-		$(use_enable nls) \
-		$(use_enable uim) \
-		$(use_enable scim) \
-		$(use_enable m17n-lib m17nlib) \
-		$(use_enable static-libs static) \
-		${myconf} || die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	doicon contrib/icon/mlterm* || die
-	make_desktop_entry mlterm mlterm mlterm-icon TerminalEmulator || die
-
-	dodoc ChangeLog README || die
-
-	docinto ja
-	dodoc doc/ja/* || die
-	docinto en
-	dodoc doc/en/* || die
-}
diff --git a/x11-terms/mlterm/mlterm-3.0.7.ebuild b/x11-terms/mlterm/mlterm-3.0.7.ebuild
deleted file mode 100644
index 5705cc2522ac..000000000000
--- a/x11-terms/mlterm/mlterm-3.0.7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.7.ebuild,v 1.3 2012/05/03 07:11:34 jdhore Exp $
-
-EAPI="3"
-inherit autotools eutils
-
-IUSE="bidi debug gtk ibus libssh2 m17n-lib nls scim static-libs uim xft"
-
-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 ~x86"
-LICENSE="BSD"
-
-RDEPEND="|| ( sys-libs/libutempter sys-apps/utempter )
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	gtk? ( x11-libs/gtk+:2 )
-	xft? ( x11-libs/libXft )
-	bidi? ( >=dev-libs/fribidi-0.10.4 )
-	ibus? ( >=app-i18n/ibus-1.3 )
-	libssh2? ( net-libs/libssh2 )
-	nls? ( virtual/libintl )
-	uim? ( >=app-i18n/uim-1.0 )
-	scim? ( >=app-i18n/scim-1.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )"
-#	vte? ( x11-libs/vte )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.9.4-uim15-fix.patch \
-		"${FILESDIR}"/${PN}-3.0.5-ibus.patch \
-		"${FILESDIR}"/${PN}-3.0.7-ldflags.patch \
-		"${FILESDIR}"/${PN}-3.0.7-underlinking.patch
-
-	eautoconf
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk ; then
-		myconf="${myconf} --with-imagelib=gdk-pixbuf"
-	else
-		myconf="${myconf} --with-tools=mlclient,mlcc"
-	fi
-
-	if use xft ; then
-		myconf="${myconf} --with-type-engines=xft"
-	else
-		myconf="${myconf} --with-type-engines=xcore"
-	fi
-
-	# iiimf isn't stable enough
-	#myconf="${myconf} $(use_enable iiimf)"
-
-	econf --enable-utmp \
-		$(use_enable bidi fribidi) \
-		$(use_enable debug) \
-		$(use_enable ibus) \
-		$(use_enable libssh2 ssh2) \
-		$(use_enable nls) \
-		$(use_enable uim) \
-		$(use_enable scim) \
-		$(use_enable m17n-lib m17nlib) \
-		$(use_enable static-libs static) \
-		${myconf} || die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	doicon contrib/icon/mlterm* || die
-	make_desktop_entry mlterm mlterm mlterm-icon TerminalEmulator || die
-
-	dodoc ChangeLog README || die
-
-	docinto ja
-	dodoc doc/ja/* || die
-	docinto en
-	dodoc doc/en/* || die
-}
diff --git a/x11-terms/mlterm/mlterm-3.0.8.ebuild b/x11-terms/mlterm/mlterm-3.0.9-r1.ebuild
index b5af238ffc27..74bcb0bd910a 100644
--- a/x11-terms/mlterm/mlterm-3.0.8.ebuild
+++ b/x11-terms/mlterm/mlterm-3.0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.8.ebuild,v 1.3 2012/05/03 07:11:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.9-r1.ebuild,v 1.1 2012/06/21 13:41:09 naota Exp $
 
 EAPI="3"
 inherit autotools eutils
@@ -82,7 +82,7 @@ src_install () {
 	fi
 
 	doicon contrib/icon/mlterm* || die
-	make_desktop_entry mlterm mlterm mlterm-icon TerminalEmulator || die
+	make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator" || die
 
 	dodoc ChangeLog README || die