6 files changed, 16 insertions, 90 deletions
diff --git a/dev-libs/m17n-lib/ChangeLog b/dev-libs/m17n-lib/ChangeLog
index 44d3d4b4484e..ff24b9948f8f 100644
--- a/dev-libs/m17n-lib/ChangeLog
+++ b/dev-libs/m17n-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/m17n-lib
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.22 2005/04/08 16:15:06 corsair Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.23 2006/02/10 22:43:01 liquidx Exp $
+
+  10 Feb 2006; Alastair Tse <liquidx@gentoo.org> -m17n-lib-1.0.2-r1.ebuild,
+  -m17n-lib-1.1.0.ebuild, m17n-lib-1.2.0.ebuild:
+  modular-x-ified. cleanup old ebuilds.
 
   08 Apr 2005; Markus Rothe <corsair@gentoo.org> m17n-lib-1.2.0.ebuild:
   Stable on ppc64
diff --git a/dev-libs/m17n-lib/files/digest-m17n-lib-1.0.2-r1 b/dev-libs/m17n-lib/files/digest-m17n-lib-1.0.2-r1
deleted file mode 100644
index c43ff7bfb2d9..000000000000
--- a/dev-libs/m17n-lib/files/digest-m17n-lib-1.0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e2d5088d666fca4ed06357000385932 m17n-lib-1.0.2.tar.gz 478985
diff --git a/dev-libs/m17n-lib/files/digest-m17n-lib-1.1.0 b/dev-libs/m17n-lib/files/digest-m17n-lib-1.1.0
deleted file mode 100644
index 1fd7d2930fed..000000000000
--- a/dev-libs/m17n-lib/files/digest-m17n-lib-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ee402c37e1a459b274f1ccb2a4d90f3 m17n-lib-1.1.0.tar.gz 657484
diff --git a/dev-libs/m17n-lib/m17n-lib-1.0.2-r1.ebuild b/dev-libs/m17n-lib/m17n-lib-1.0.2-r1.ebuild
deleted file mode 100644
index b3765f3bad6d..000000000000
--- a/dev-libs/m17n-lib/m17n-lib-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.0.2-r1.ebuild,v 1.10 2005/01/01 16:20:58 usata Exp $
-
-inherit eutils flag-o-matic libtool
-
-DESCRIPTION="Multilingual Library for Unix/Linux"
-HOMEPAGE="http://www.m17n.org/m17n-lib/"
-SRC_URI="http://www.m17n.org/m17n-lib/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="x86 alpha ppc amd64 ppc64 ~sparc"
-IUSE=""
-
-DEPEND="virtual/x11
-	dev-libs/libxml2
-	dev-libs/fribidi
-	>=media-libs/freetype-2.1
-	dev-libs/libotf
-	dev-db/m17n-db"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-typedef.diff
-}
-
-src_compile() {
-
-	elibtoolize
-	econf || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/dev-libs/m17n-lib/m17n-lib-1.1.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.1.0.ebuild
deleted file mode 100644
index 9a2f9e1c4fe6..000000000000
--- a/dev-libs/m17n-lib/m17n-lib-1.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.1.0.ebuild,v 1.7 2005/01/01 16:20:58 usata Exp $
-
-inherit eutils
-
-DESCRIPTION="Multilingual Library for Unix/Linux"
-HOMEPAGE="http://www.m17n.org/m17n-lib/"
-SRC_URI="http://www.m17n.org/m17n-lib/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="x86 alpha ppc amd64 ~ppc64 sparc"
-IUSE=""
-
-DEPEND="virtual/x11
-	dev-libs/libxml2
-	dev-libs/fribidi
-	>=media-libs/freetype-2.1
-	>=dev-libs/libotf-0.9.2
-	>=dev-db/m17n-db-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fpic.patch
-}
-
-src_compile() {
-	econf || die
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild
index 0f0a1cb0b047..5c9a1fe9be61 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild,v 1.6 2005/04/08 16:15:06 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.2.0.ebuild,v 1.7 2006/02/10 22:43:01 liquidx Exp $
 
 inherit eutils
 
@@ -14,8 +14,14 @@ SLOT="0"
 KEYWORDS="x86 alpha ppc amd64 ppc64 sparc hppa"
 IUSE=""
 
-DEPEND="virtual/x11
-	virtual/xft
+DEPEND="|| ( (
+		       x11-libs/libXaw
+			   x11-libs/libICE
+			   x11-libs/libXrender
+			   x11-libs/libXft
+			 )
+			 virtual/x11
+		   )
 	dev-libs/libxml2
 	dev-libs/fribidi
 	>=media-libs/freetype-2.1