modular-x-ified. cleanup.

(Portage version: 2.1_pre4-r1)

6 files changed, 13 insertions, 70 deletions

diff --git a/dev-libs/libotf/ChangeLog b/dev-libs/libotf/ChangeLog
index a574af3d732f..6b90cd5790d1 100644
--- a/dev-libs/libotf/ChangeLog
+++ b/dev-libs/libotf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libotf
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/ChangeLog,v 1.19 2005/04/08 16:07:48 corsair Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/ChangeLog,v 1.20 2006/02/10 22:30:00 liquidx Exp $
+
+  10 Feb 2006; Alastair Tse <liquidx@gentoo.org> -libotf-0.9-r1.ebuild,
+  -libotf-0.9.2.ebuild, libotf-0.9.3.ebuild:
+  modular-x-ified. cleanup.
 
   08 Apr 2005; Markus Rothe <corsair@gentoo.org> libotf-0.9.3.ebuild:
   Stable on ppc64
diff --git a/dev-libs/libotf/files/digest-libotf-0.9-r1 b/dev-libs/libotf/files/digest-libotf-0.9-r1
deleted file mode 100644
index aea3c7e2bcaa..000000000000
--- a/dev-libs/libotf/files/digest-libotf-0.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09fd82c268718f95cd367c3b6faddfe2 libotf-0.9.tar.gz 256323
diff --git a/dev-libs/libotf/files/digest-libotf-0.9.2 b/dev-libs/libotf/files/digest-libotf-0.9.2
deleted file mode 100644
index 92356e188e26..000000000000
--- a/dev-libs/libotf/files/digest-libotf-0.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 579f088d64844c00a1f1036a04b53a0a libotf-0.9.2.tar.gz 338447
diff --git a/dev-libs/libotf/libotf-0.9-r1.ebuild b/dev-libs/libotf/libotf-0.9-r1.ebuild
deleted file mode 100644
index c362f8026c8f..000000000000
--- a/dev-libs/libotf/libotf-0.9-r1.ebuild
+++ /dev/null
@@ -1,31 +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/libotf/libotf-0.9-r1.ebuild,v 1.6 2005/01/01 16:19:57 usata Exp $
-
-DESCRIPTION="Library for handling OpenType fonts (OTF)"
-HOMEPAGE="http://www.m17n.org/libotf/"
-SRC_URI="http://www.m17n.org/libotf/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="x86 ppc alpha amd64 ppc64 ~sparc"
-IUSE="X"
-
-RDEPEND="X? ( virtual/x11 )
-	>=media-libs/freetype-2.1"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use X || sed -i -e '/^bin_PROGRAMS/s/otfview//' example/Makefile.in || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS INSTALL NEWS README ChangeLog
-}
diff --git a/dev-libs/libotf/libotf-0.9.2.ebuild b/dev-libs/libotf/libotf-0.9.2.ebuild
deleted file mode 100644
index 6d5967f72d31..000000000000
--- a/dev-libs/libotf/libotf-0.9.2.ebuild
+++ /dev/null
@@ -1,31 +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/libotf/libotf-0.9.2.ebuild,v 1.5 2005/01/01 16:19:57 usata Exp $
-
-DESCRIPTION="Library for handling OpenType fonts (OTF)"
-HOMEPAGE="http://www.m17n.org/libotf/"
-SRC_URI="http://www.m17n.org/libotf/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="x86 ppc alpha amd64 ~ppc64 sparc"
-IUSE="X"
-
-RDEPEND="X? ( virtual/x11 )
-	>=media-libs/freetype-2.1"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use X || sed -i -e '/^bin_PROGRAMS/s/otfview//' example/Makefile.in || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS INSTALL NEWS README ChangeLog
-}
diff --git a/dev-libs/libotf/libotf-0.9.3.ebuild b/dev-libs/libotf/libotf-0.9.3.ebuild
index fe900e8819bf..0e98d07e6733 100644
--- a/dev-libs/libotf/libotf-0.9.3.ebuild
+++ b/dev-libs/libotf/libotf-0.9.3.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/libotf/libotf-0.9.3.ebuild,v 1.6 2005/04/08 16:07:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/libotf-0.9.3.ebuild,v 1.7 2006/02/10 22:30:00 liquidx Exp $
 
 DESCRIPTION="Library for handling OpenType fonts (OTF)"
 HOMEPAGE="http://www.m17n.org/libotf/"
@@ -11,9 +11,12 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="x86 ppc alpha amd64 ppc64 sparc hppa"
 IUSE="X"
-
-RDEPEND="X? ( virtual/x11 )
+RDEPEND="|| ( ( x11-libs/libXaw 
+				x11-libs/libICE
+			  )
+			  virtual/x11 )		
 	>=media-libs/freetype-2.1"
+
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"