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

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

8 files changed, 14 insertions, 441 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/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