Cleaned out duplicate versions

11 files changed, 12 insertions, 213 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index 655fc47d5272..1e705a596901 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/mlterm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.18 2003/10/27 17:53:47 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.19 2003/11/01 11:31:39 usata Exp $
+
+  01 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> mlterm-2.6.3-r1.ebuild,
+  mlterm-2.6.3-r2.ebuild, mlterm-2.6.3.ebuild, mlterm-2.7.0.ebuild,
+  mlterm-2.8.0.ebuild:
+  Cleaned out duplicate versions
 
 *mlterm-2.8.0_p1-r1 (27 Oct 2003)
 
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index c9e940f62d4b..37498d351bb8 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,22 +1,14 @@
-MD5 925185155b371760532f028ff96703ca mlterm-2.6.3-r1.ebuild 1144
-MD5 9c532f1ca1a47f58396b97df440f4cc8 mlterm-2.7.0-r1.ebuild 1306
-MD5 ada0964765643966a4abda2307fe1dbb mlterm-2.6.3.ebuild 1041
+MD5 861136676a84615a8ed56120f5e5b4c0 ChangeLog 2673
 MD5 d714967266da9feec2fdf7dcb7442d31 mlterm-2.5.0-r1.ebuild 1043
-MD5 2fb85550e0064a4ae0b784cd664355a3 mlterm-2.6.3-r2.ebuild 1268
 MD5 6c3ff98b0c1d552812bdfb6540d3a4cc mlterm-2.6.2.ebuild 1043
-MD5 82587b09f2c92e6fe6873bff099b6f75 mlterm-2.7.0.ebuild 1248
-MD5 4e43e2bf5b18c11063664b515ff24b7d ChangeLog 2476
+MD5 59ff1ac790583490234473cfe2eca231 mlterm-2.6.3-r2.ebuild 1265
+MD5 9c532f1ca1a47f58396b97df440f4cc8 mlterm-2.7.0-r1.ebuild 1306
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 25e7e7048748064cc1ce48ad70b34793 mlterm-2.8.0.ebuild 1204
 MD5 897160590f87c3f0b5924215e293e55a mlterm-2.8.0_p1.ebuild 1516
 MD5 75486e594e8d84e9a89eede0d5efe3d6 mlterm-2.8.0_p1-r1.ebuild 1578
-MD5 eec1ca22e9d39b3795fa8dc08e948167 files/digest-mlterm-2.6.2 65
-MD5 2eb5c2051e8917a0ee06e9902dcf2e16 files/digest-mlterm-2.6.3 65
-MD5 61b653fe840ef82968a2bb425dbbdaf5 files/digest-mlterm-2.7.0 65
 MD5 8ae11eea8e60c50e9427891bbbcd136f files/digest-mlterm-2.5.0-r1 65
-MD5 2eb5c2051e8917a0ee06e9902dcf2e16 files/digest-mlterm-2.6.3-r1 65
+MD5 eec1ca22e9d39b3795fa8dc08e948167 files/digest-mlterm-2.6.2 65
 MD5 2eb5c2051e8917a0ee06e9902dcf2e16 files/digest-mlterm-2.6.3-r2 65
 MD5 61b653fe840ef82968a2bb425dbbdaf5 files/digest-mlterm-2.7.0-r1 65
-MD5 feb003168fafc7b5623ba9c12efef4da files/digest-mlterm-2.8.0 65
 MD5 a0803ba46dc61092ab4aed1119efee8c files/digest-mlterm-2.8.0_p1 129
 MD5 a0803ba46dc61092ab4aed1119efee8c files/digest-mlterm-2.8.0_p1-r1 129
diff --git a/x11-terms/mlterm/files/digest-mlterm-2.6.3 b/x11-terms/mlterm/files/digest-mlterm-2.6.3
deleted file mode 100644
index 1213135824be..000000000000
--- a/x11-terms/mlterm/files/digest-mlterm-2.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c0dc67e8a12d07f992226fe130881f6 mlterm-2.6.3.tar.gz 1669131
diff --git a/x11-terms/mlterm/files/digest-mlterm-2.6.3-r1 b/x11-terms/mlterm/files/digest-mlterm-2.6.3-r1
deleted file mode 100644
index 1213135824be..000000000000
--- a/x11-terms/mlterm/files/digest-mlterm-2.6.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c0dc67e8a12d07f992226fe130881f6 mlterm-2.6.3.tar.gz 1669131
diff --git a/x11-terms/mlterm/files/digest-mlterm-2.7.0 b/x11-terms/mlterm/files/digest-mlterm-2.7.0
deleted file mode 100644
index bf1c29ab14ba..000000000000
--- a/x11-terms/mlterm/files/digest-mlterm-2.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03d6cf243ada71e3b80553a9a4a8a372 mlterm-2.7.0.tar.gz 1743950
diff --git a/x11-terms/mlterm/files/digest-mlterm-2.8.0 b/x11-terms/mlterm/files/digest-mlterm-2.8.0
deleted file mode 100644
index 2e71b25d8607..000000000000
--- a/x11-terms/mlterm/files/digest-mlterm-2.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 69b38c6909ba8cd2e81edd18fc612b1f mlterm-2.8.0.tar.gz 1819417
diff --git a/x11-terms/mlterm/mlterm-2.6.3-r1.ebuild b/x11-terms/mlterm/mlterm-2.6.3-r1.ebuild
deleted file mode 100644
index a637859affec..000000000000
--- a/x11-terms/mlterm/mlterm-2.6.3-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.6.3-r1.ebuild,v 1.1 2003/04/19 11:57:47 mksoft Exp $
-
-IUSE="truetype gtk gnome imlib nls"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-LICENSE="BSD"
-
-DEPEND="virtual/x11
-	imlib?    ( >=media-libs/imlib-1.9.14 )
-	gtk?      ( >=x11-libs/gtk+-1.2.10 )
-	gnome?    ( >=media-libs/gdk-pixbuf-0.18.0 )
-	truetype? ( >=media-libs/freetype-2.1.2 )
-	nls?      ( >=dev-libs/fribidi-0.10.4 )"
-
-
-src_compile() {
-	local myconf
-
-	use imlib \
-		&& myconf="${myconf} --enable-imlib"
-
-	use gnome \
-		&& myconf="${myconf} --enable-gdk-pixbuf"
-
-	use truetype \
-		&& myconf="${myconf} --enable-anti-alias"
-
-	use nls \
-		&& myconf="${myconf} --enable-fribidi"
-
-	myconf="${myconf} --enable-utmp"
-
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog LICENCE README
-}
diff --git a/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild b/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild
index cac1c0d5ffef..73f06e6d4e43 100644
--- a/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild
+++ b/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild,v 1.1 2003/05/12 18:12:35 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.6.3-r2.ebuild,v 1.2 2003/11/01 11:31:39 usata Exp $
 
 IUSE="truetype gtk gtk2 gnome imlib nls"
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://mlterm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 LICENSE="BSD"
 
 DEPEND="virtual/x11
diff --git a/x11-terms/mlterm/mlterm-2.6.3.ebuild b/x11-terms/mlterm/mlterm-2.6.3.ebuild
deleted file mode 100644
index 6d0f743810da..000000000000
--- a/x11-terms/mlterm/mlterm-2.6.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.6.3.ebuild,v 1.2 2003/03/24 14:52:22 nakano Exp $
-
-IUSE="truetype gtk gnome imlib"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="x86 ppc"
-LICENSE="BSD"
-
-DEPEND="virtual/x11
-	imlib?    ( >=media-libs/imlib-1.9.14 )
-	gtk?      ( >=x11-libs/gtk+-1.2.10 )
-	gnome?    ( >=media-libs/gdk-pixbuf-0.18.0 )
-	truetype? ( >=media-libs/freetype-2.1.2 )"
-
-
-src_compile() {
-	local myconf
-
-	use imlib \
-		&& myconf="${myconf} --enable-imlib"
-
-	use gnome \
-		&& myconf="${myconf} --enable-gdk-pixbuf"
-
-	use truetype \
-		&& myconf="${myconf} --enable-anti-alias"
-
-	myconf="${myconf} --enable-utmp"
-
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog LICENCE README
-}
diff --git a/x11-terms/mlterm/mlterm-2.7.0.ebuild b/x11-terms/mlterm/mlterm-2.7.0.ebuild
deleted file mode 100644
index 3ce36d1c9d1a..000000000000
--- a/x11-terms/mlterm/mlterm-2.7.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.7.0.ebuild,v 1.1 2003/06/16 15:00:19 nakano Exp $
-
-IUSE="truetype gtk gtk2 gnome imlib"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-LICENSE="BSD"
-
-DEPEND="virtual/x11
-	gtk?      ( =x11-libs/gtk+-1.2* )
-	gtk2?     ( >=x11-libs/gtk+-2.0.8 )
-	!gtk2? ( imlib? ( >=media-libs/imlib-1.9.14 )
-			 gnome? ( >=media-libs/gdk-pixbuf-0.18.0 ) )
-	truetype? ( >=media-libs/freetype-2.1.2 )"
-#	nls?      ( >=dev-libs/fribidi-0.10.4 )"
-
-src_compile() {
-	local myconf
-
-	use gtk2 \
-		&& myconf="${myconf} --with-imagelib=gdk-pixbuf2"
-
-	use imlib \
-		&& myconf="${myconf} --with-imagelib=imlib"
-
-	use gnome \
-		&& myconf="${myconf} --with-imagelib=gdk-pixbuf1"
-
-	use truetype \
-		&& myconf="${myconf} --enable-anti-alias"
-
-#	use nls \
-#		&& myconf="${myconf} --enable-fribidi"
-
-	myconf="${myconf} --enable-utmp"
-
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	dodoc ChangeLog LICENCE README
-}
diff --git a/x11-terms/mlterm/mlterm-2.8.0.ebuild b/x11-terms/mlterm/mlterm-2.8.0.ebuild
deleted file mode 100644
index 829cbea9c883..000000000000
--- a/x11-terms/mlterm/mlterm-2.8.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.8.0.ebuild,v 1.1 2003/10/05 21:42:48 usata Exp $
-
-IUSE="truetype gtk gtk2 gnome imlib nls"
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlterm/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-LICENSE="BSD"
-
-DEPEND="virtual/x11
-	gtk? ( gtk2? >=x11-libs/gtk+-2.0.8 : >=media-libs/gdk-pixbuf-0.18.0 )
-	!gtk? ( imlib? >=media-libs/imlib-1.9.14 )
-	truetype? ( >=media-libs/freetype-2.1.2 )
-	nls? ( >=dev-libs/fribidi-0.10.4 )"
-
-src_compile() {
-
-	local myconf
-
-	use imlib && myconf="${myconf} --with-imagelib=imlib"
-	use gtk && myconf="${myconf} --with-imagelib=gdk-pixbuf1"
-	use gtk2 && myconf="${myconf} --with-imagelib=gdk-pixbuf2"
-
-	econf `use_enable truetype anti-alias` \
-		`use_enable nls` \
-		`use_enable nls fribidi` \
-		--enable-utmp \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-
-	#dodir /etc/mlterm
-	#dodir /usr/bin
-	einstall || die
-
-	dodoc ChangeLog LICENCE README
-}